Skip to content

Commit

Permalink
Documentation: Update 'linux-2.6.git' -> 'linux.git'
Browse files Browse the repository at this point in the history
The 3.x tree has been out for a while now.  The -2.6 repository name
survived the initial release [1], but kernel.org now only lists
'linux.git' (for aegl as well as torvalds) [2].

[1]: http://article.gmane.org/gmane.linux.kernel/1147422
  On 2011-05-30 01:47:57 GMT, Linus Torvalds wrote:
  > ... yes, that means that my git tree is still called
  > "linux-2.6.git" on kernel.org.
[2]: http://git.kernel.org/cgit/

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
W. Trevor King authored and Junio C Hamano committed Jun 23, 2013
1 parent 34a25d4 commit 283efb0
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Documentation/git-clone.txt
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ Examples
* Clone from upstream:
+
------------
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
$ cd my2.6
$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux
$ cd my-linux
$ make
------------

Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-fast-export.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ Limitations
-----------

Since 'git fast-import' cannot tag trees, you will not be
able to export the linux-2.6.git repository completely, as it contains
able to export the linux.git repository completely, as it contains
a tag referencing a tree instead of a commit.

GIT
Expand Down
6 changes: 3 additions & 3 deletions Documentation/technical/racy-git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ them, and give the same timestamp to the index file:
$ git ls-files | git update-index --stdin
$ touch -r .datestamp .git/index

This will make all index entries racily clean. The linux-2.6
project, for example, there are over 20,000 files in the working
tree. On my Athlon 64 X2 3800+, after the above:
This will make all index entries racily clean. The linux project, for
example, there are over 20,000 files in the working tree. On my
Athlon 64 X2 3800+, after the above:

$ /usr/bin/time git diff-files
1.68user 0.54system 0:02.22elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
Expand Down
8 changes: 4 additions & 4 deletions Documentation/user-manual.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
The initial clone may be time-consuming for a large project, but you
will only need to clone once.

The clone command creates a new directory named after the project (`git`
or `linux-2.6` in the examples above). After you cd into this
The clone command creates a new directory named after the project
(`git` or `linux` in the examples above). After you cd into this
directory, you will see that it contains a copy of the project files,
called the <<def_working_tree,working tree>>, together with a special
top-level directory named `.git`, which contains all the information
Expand Down Expand Up @@ -2162,7 +2162,7 @@ To set this up, first create your work tree by cloning Linus's public
tree:

-------------------------------------------------
$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git work
$ cd work
-------------------------------------------------

Expand Down Expand Up @@ -2204,7 +2204,7 @@ make it easy to push both branches to your public tree. (See
-------------------------------------------------
$ cat >> .git/config <<EOF
[remote "mytree"]
url = master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
url = master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux.git
push = release
push = test
EOF
Expand Down
2 changes: 1 addition & 1 deletion t/perf/README
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ You can set the following variables (also in your config.mak):
GIT_PERF_LARGE_REPO
Repositories to copy for the performance tests. The normal
repo should be at least git.git size. The large repo should
probably be about linux-2.6.git size for optimal results.
probably be about linux.git size for optimal results.
Both default to the git.git you are running from.

You can also pass the options taken by ordinary git tests; the most
Expand Down

0 comments on commit 283efb0

Please sign in to comment.