From: Junio C Hamano Date: Thu, 29 May 2014 22:42:29 GMT Subject: [PATCH 4/5] fetch doc: on pulling multiple refspecs Message-ID: <1401403350-7122-5-git-send-email-gitster@pobox.com> In-Reply-To: <1401403350-7122-1-git-send-email-gitster@pobox.com> 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 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index e266c2d..ea4c5a6 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -34,22 +34,26 @@ 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 'git pull' command without any explicit parameters. 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 +an Octopus merge. On the other hand, 'git pull' that is run +without any explicit parameter takes default +s from `remote..fetch` configuration, it merges only the first found into the current branch, -after fetching all the remote refs. This is because making an +after fetching all the remote refs specified. 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. + -- 2.0.0-479-g59ac8f9