From 5d59a32fa1b579f5dd8ef1449bd3f1945f235915 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 29 May 2014 13:07:44 -0700 Subject: fetch doc: on pulling multiple refspecs Replace desription of old-style "Pull:" lines in remotes/ configuration with modern remote.*.fetch variables. As this note applies only to "git pull", enable it only in git-pull manual page. Signed-off-by: Junio C Hamano --- Documentation/pull-fetch-param.txt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'Documentation/pull-fetch-param.txt') diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index 40f868756d..9cb78d4f75 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -34,22 +34,27 @@ will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch. +ifdef::git-pull[] + [NOTE] There is a difference between listing multiple directly on 'git pull' command line and having multiple -`Pull:` lines for a and running +`remote..fetch` entries in your configuration +for a and running a 'git pull' command without any explicit parameters. - listed explicitly on the command line are always +s 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 -parameter takes default s from `Pull:` lines, it -merges only the first found into the current branch, -after fetching all the remote refs. This is because making an +if you list more than one remote ref, 'git pull' will create +an Octopus merge. On the other hand, if you do not list any +explicit parameter on the command line, 'git pull' +will fetch all the s it finds in the +`remote..fetch` configuration and merge +only the first found into the current branch. +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. +endif::git-pull[] + Some short-cut notations are also supported. + -- cgit v1.2.3