diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
commit | ba4b9286c25f18c7ebbb809ee5732a7810377ab6 (patch) | |
tree | 390507328a7564b65dc803683c34235700b97409 /pull-fetch-param.txt | |
parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'pull-fetch-param.txt')
-rw-r--r-- | pull-fetch-param.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pull-fetch-param.txt b/pull-fetch-param.txt index cbee36994..00a8d2104 100644 --- a/pull-fetch-param.txt +++ b/pull-fetch-param.txt @@ -32,7 +32,7 @@ must know this is the expected usage pattern for a branch. [NOTE] You never do your own development on branches that appear on the right hand side of a <refspec> colon on `Pull:` lines; -they are to be updated by `git-fetch`. If you intend to do +they are to be updated by 'git-fetch'. If you intend to do development derived from a remote branch `B`, have a `Pull:` line to track it (i.e. `Pull: B:remote-B`), and have a separate branch `my-B` to do your development on top of it. The latter @@ -44,13 +44,13 @@ on the remote branch, merge it into your development branch with + [NOTE] There is a difference between listing multiple <refspec> -directly on `git-pull` command line and having multiple +directly on 'git-pull' command line and having multiple `Pull:` <refspec> lines for a <repository> and running -`git-pull` command without any explicit <refspec> parameters. +'git-pull' command without any explicit <refspec> parameters. <refspec> listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote refs, you would be making -an Octopus. While `git-pull` run without any explicit <refspec> +an Octopus. While 'git-pull' run without any explicit <refspec> parameter takes default <refspec>s from `Pull:` lines, it merges only the first <refspec> found into the current branch, after fetching all the remote refs. This is because making an |