Skip to content

Commit 283efb0

Browse files
wkinggitster
authored andcommitted
Documentation: Update 'linux-2.6.git' -> 'linux.git'
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 34a25d4 commit 283efb0

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

Documentation/git-clone.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ Examples
239239
* Clone from upstream:
240240
+
241241
------------
242-
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
243-
$ cd my2.6
242+
$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux
243+
$ cd my-linux
244244
$ make
245245
------------
246246

Documentation/git-fast-export.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Limitations
141141
-----------
142142

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

147147
GIT

Documentation/technical/racy-git.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ them, and give the same timestamp to the index file:
135135
$ git ls-files | git update-index --stdin
136136
$ touch -r .datestamp .git/index
137137

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

142142
$ /usr/bin/time git diff-files
143143
1.68user 0.54system 0:02.22elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k

Documentation/user-manual.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
6666
The initial clone may be time-consuming for a large project, but you
6767
will only need to clone once.
6868

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

21642164
-------------------------------------------------
2165-
$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
2165+
$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git work
21662166
$ cd work
21672167
-------------------------------------------------
21682168

@@ -2204,7 +2204,7 @@ make it easy to push both branches to your public tree. (See
22042204
-------------------------------------------------
22052205
$ cat >> .git/config <<EOF
22062206
[remote "mytree"]
2207-
url = master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
2207+
url = master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux.git
22082208
push = release
22092209
push = test
22102210
EOF

t/perf/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ You can set the following variables (also in your config.mak):
6666
GIT_PERF_LARGE_REPO
6767
Repositories to copy for the performance tests. The normal
6868
repo should be at least git.git size. The large repo should
69-
probably be about linux-2.6.git size for optimal results.
69+
probably be about linux.git size for optimal results.
7070
Both default to the git.git you are running from.
7171

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

0 commit comments

Comments
 (0)