diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fetch.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-merge.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-pull.txt | 5 | ||||
| -rw-r--r-- | Documentation/pull-fetch-param.txt | 22 |
4 files changed, 30 insertions, 4 deletions
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 71693650c4..73f8a99ffe 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -37,6 +37,11 @@ include::pull-fetch-param.txt[] update the index and working directory, so use it with care. +SEE ALSO +-------- +gitlink:git-pull[1] + + Author ------ Written by Linus Torvalds <torvalds@osdl.org> and diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index da6537d911..3e058db996 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -37,7 +37,7 @@ include::merge-pull-opts.txt[] SEE ALSO -------- -gitlink:git-fmt-merge-msg[1] +gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1] Author diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 5a11da1f74..ec10a2f409 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -141,6 +141,11 @@ merge the remote `origin` head into the current, local `master` branch. +SEE ALSO +-------- +gitlink:git-fetch[1], gitlink:git-merge[1] + + Author ------ Written by Linus Torvalds <torvalds@osdl.org> diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index 2a7131874b..57e9ddf0d6 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -17,12 +17,12 @@ file in `$GIT_DIR/remotes` directory can be given; the named file should be in the following format: + URL: one of the above URL format - Push: <refspec>... - Pull: <refspec>... + Push: <refspec> + Pull: <refspec> + When such a short-hand is specified in place of <repository> without <refspec> parameters on the command -line, <refspec>... specified on `Push:` lines or `Pull:` +line, <refspec> specified on `Push:` lines or `Pull:` lines are used for `git-push` and `git-fetch`/`git-pull`, respectively. Multiple `Push:` and and `Pull:` lines may be specified for additional branch mappings. @@ -91,6 +91,22 @@ remote `master` branch to a local `origin` branch, which is then merged to a local development branch, again typically named `master`. + +[NOTE] +There is a difference between listing multiple <refspec> +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. +<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> +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 +Octopus from remote refs is rarely done, while keeping track +of multiple remote heads in one-go by fetching more than one +is often useful. ++ Some short-cut notations are also supported. + * For backward compatibility, `tag` is almost ignored; |