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>
maint
W. Trevor King 2013-06-22 10:46:26 -04:00 committed by Junio C Hamano
parent f22a6543d1
commit 34a25d4c90
2 changed files with 32 additions and 19 deletions

View File

@ -187,18 +187,25 @@ Examples
$ git remote $ git remote
origin origin
$ git branch -r $ git branch -r
origin/master origin/HEAD -> origin/master
$ git remote add linux-nfs git://linux-nfs.org/pub/linux/nfs-2.6.git origin/master
$ git remote add staging git://git.kernel.org/.../gregkh/staging.git
$ git remote $ git remote
linux-nfs
origin origin
$ git fetch staging
* refs/remotes/linux-nfs/master: storing branch 'master' ... $ git fetch staging
commit: bf81b46 ...
From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
* [new branch] master -> staging/master
* [new branch] staging-linus -> staging/staging-linus
* [new branch] staging-next -> staging/staging-next
$ git branch -r $ git branch -r
origin/master origin/HEAD -> origin/master
linux-nfs/master origin/master
$ git checkout -b nfs linux-nfs/master staging/master
staging/staging-linus
staging/staging-next
$ git checkout -b staging staging/master
... ...
------------ ------------



View File

@ -431,19 +431,25 @@ You can also track branches from repositories other than the one you
cloned from, using linkgit:git-remote[1]: cloned from, using linkgit:git-remote[1]:


------------------------------------------------- -------------------------------------------------
$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git $ git remote add staging git://git.kernel.org/.../gregkh/staging.git
$ git fetch linux-nfs $ git fetch staging
* refs/remotes/linux-nfs/master: storing branch 'master' ... ...
commit: bf81b46 From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
* [new branch] master -> staging/master
* [new branch] staging-linus -> staging/staging-linus
* [new branch] staging-next -> staging/staging-next
------------------------------------------------- -------------------------------------------------


New remote-tracking branches will be stored under the shorthand name New remote-tracking branches will be stored under the shorthand name
that you gave `git remote add`, in this case `linux-nfs`: that you gave `git remote add`, in this case `staging`:


------------------------------------------------- -------------------------------------------------
$ git branch -r $ git branch -r
linux-nfs/master origin/HEAD -> origin/master
origin/master origin/master
staging/master
staging/staging-linus
staging/staging-next
------------------------------------------------- -------------------------------------------------


If you run `git fetch <remote>` later, the remote-tracking branches If you run `git fetch <remote>` later, the remote-tracking branches
@ -455,9 +461,9 @@ a new stanza:
------------------------------------------------- -------------------------------------------------
$ cat .git/config $ cat .git/config
... ...
[remote "linux-nfs"] [remote "staging"]
url = git://linux-nfs.org/pub/nfs-2.6.git url = git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
fetch = +refs/heads/*:refs/remotes/linux-nfs/* fetch = +refs/heads/*:refs/remotes/staging/*
... ...
------------------------------------------------- -------------------------------------------------