diff options
author | 2013-07-01 12:41:34 -0700 | |
---|---|---|
committer | 2013-07-01 12:41:34 -0700 | |
commit | 0d07e98e741b50dbb4b98d561f7aeb48fb6a7bbc (patch) | |
tree | b448a5b7092cd48f9c62c92557678df1a6c9ef32 /Documentation/git-remote.txt | |
parent | Merge branch 'jc/topo-author-date-sort' (diff) | |
parent | Documentation: Update 'linux-2.6.git' -> 'linux.git' (diff) | |
download | tgif-0d07e98e741b50dbb4b98d561f7aeb48fb6a7bbc.tar.xz |
Merge branch 'wk/doc-in-linux-3.x-era'
Update documentation to match more recent realities.
* wk/doc-in-linux-3.x-era:
Documentation: Update 'linux-2.6.git' -> 'linux.git'
Documentation: Update the NFS remote examples to use the staging repo
doc/clone: Pick more compelling paths for the --reference example
doc/clone: Remove the '--bare -l -s' example
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 581bb4c413..9c3e3bf83a 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 ... ------------ |