diff options
| author | W. Trevor King <wking@tremily.us> | 2013-06-22 14:46:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-23 06:35:17 (GMT) |
| commit | 34a25d4c9004fd17ce8cbd648d29600caccfd9b6 (patch) | |
| tree | fff2d705fa48e193b0fdd151cae8c4073a5c7e7a /Documentation/git-remote.txt | |
| parent | f22a6543d17d615068652d0f94397f558158d91a (diff) | |
| download | git-34a25d4c9004fd17ce8cbd648d29600caccfd9b6.zip git-34a25d4c9004fd17ce8cbd648d29600caccfd9b6.tar.gz git-34a25d4c9004fd17ce8cbd648d29600caccfd9b6.tar.bz2 | |
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>
Diffstat (limited to 'Documentation/git-remote.txt')
| -rw-r--r-- | Documentation/git-remote.txt | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 581bb4c..9c3e3bf 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -187,18 +187,25 @@ Examples $ git remote origin $ git branch -r -origin/master -$ git remote add linux-nfs git://linux-nfs.org/pub/linux/nfs-2.6.git + origin/HEAD -> origin/master + origin/master +$ git remote add staging git://git.kernel.org/.../gregkh/staging.git $ git remote -linux-nfs origin -$ git fetch -* refs/remotes/linux-nfs/master: storing branch 'master' ... - commit: bf81b46 +staging +$ git fetch staging +... +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 -origin/master -linux-nfs/master -$ git checkout -b nfs linux-nfs/master + origin/HEAD -> origin/master + origin/master + staging/master + staging/staging-linus + staging/staging-next +$ git checkout -b staging staging/master ... ------------ |