Documentation: Update the NFS remote examples to use the staging repo
linux-nfs.org seems to have restructured their repository layout since 8391c60 (git-remote.txt: fix example url, 2007-11-02), and Bruce's repo is now at git://git.linux-nfs.org/projects/bfields/linux.git. Bruce also has a more richer internal branch structure (master, everything, for-3.1, ...), so updating the existing example to use his current repo may be confusing. To simplify, I've replaced the NFS repo with Greg's staging repo. I've also updated the output of the surrounding commands to match the output of a current run through. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
W. Trevor King committed
Jun 22, 2013 at 10:46 UTC
34a25d4c9004fd17ce8cbd648d29600caccfd9b6
2 files changed
+32
-19
Documentation/git-remote.txt
+16
-9
@@ -187,18 +187,25 @@ Examples
187
$ git remote
188
origin
189
$ git branch -r
190
-origin/master
191
-$ git remote add linux-nfs git://linux-nfs.org/pub/linux/nfs-2.6.git
190
+ origin/HEAD -> origin/master
191
+ origin/master
192
+$ git remote add staging git://git.kernel.org/.../gregkh/staging.git
193
$ git remote
193
-linux-nfs
194
origin
195
-$ git fetch
196
-* refs/remotes/linux-nfs/master: storing branch 'master' ...
197
- commit: bf81b46
195
+staging
196
+$ git fetch staging
197
+...
198
+From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
199
+ * [new branch] master -> staging/master
200
+ * [new branch] staging-linus -> staging/staging-linus
201
+ * [new branch] staging-next -> staging/staging-next
202
$ git branch -r
199
-origin/master
200
-linux-nfs/master
201
-$ git checkout -b nfs linux-nfs/master
203
+ origin/HEAD -> origin/master
204
+ origin/master
205
+ staging/master
206
+ staging/staging-linus
207
+ staging/staging-next
208
+$ git checkout -b staging staging/master
209
...
210
------------
211
Documentation/user-manual.txt
+16
-10
@@ -431,19 +431,25 @@ You can also track branches from repositories other than the one you
431
cloned from, using linkgit:git-remote[1]:
432
433
-------------------------------------------------
434
-$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git
435
-$ git fetch linux-nfs
436
-* refs/remotes/linux-nfs/master: storing branch 'master' ...
437
- commit: bf81b46
434
+$ git remote add staging git://git.kernel.org/.../gregkh/staging.git
435
+$ git fetch staging
436
+...
437
+From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
438
+ * [new branch] master -> staging/master
439
+ * [new branch] staging-linus -> staging/staging-linus
440
+ * [new branch] staging-next -> staging/staging-next
441
-------------------------------------------------
442
443
New remote-tracking branches will be stored under the shorthand name
441
-that you gave `git remote add`, in this case `linux-nfs`:
444
+that you gave `git remote add`, in this case `staging`:
445
446
-------------------------------------------------
447
$ git branch -r
445
-linux-nfs/master
446
-origin/master
448
+ origin/HEAD -> origin/master
449
+ origin/master
450
+ staging/master
451
+ staging/staging-linus
452
+ staging/staging-next
453
-------------------------------------------------
454
455
If you run `git fetch <remote>` later, the remote-tracking branches
@@ -455,9 +461,9 @@ a new stanza:
461
-------------------------------------------------
462
$ cat .git/config
463
...
458
-[remote "linux-nfs"]
459
- url = git://linux-nfs.org/pub/nfs-2.6.git
460
- fetch = +refs/heads/*:refs/remotes/linux-nfs/*
464
+[remote "staging"]
465
+ url = git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
466
+ fetch = +refs/heads/*:refs/remotes/staging/*
467
...
468
-------------------------------------------------
469