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 <gitster@pobox.com>
Junio C Hamano committed
May 29, 2014 at 13:07 UTC
5d59a32fa1b579f5dd8ef1449bd3f1945f235915
1 file changed
+12
-7
Documentation/pull-fetch-param.txt
+12
-7
@@ -34,22 +34,27 @@ will be needed for such branches. There is no way to
34
determine or declare that a branch will be made available
35
in a repository with this behavior; the pulling user simply
36
must know this is the expected usage pattern for a branch.
37
+ifdef::git-pull[]
38
+
39
[NOTE]
40
There is a difference between listing multiple <refspec>
41
directly on 'git pull' command line and having multiple
41
-`Pull:` <refspec> lines for a <repository> and running
42
+`remote.<repository>.fetch` entries in your configuration
43
+for a <repository> and running a
44
'git pull' command without any explicit <refspec> parameters.
43
-<refspec> listed explicitly on the command line are always
45
+<refspec>s listed explicitly on the command line are always
46
merged into the current branch after fetching. In other words,
45
-if you list more than one remote refs, you would be making
46
-an Octopus. While 'git pull' run without any explicit <refspec>
47
-parameter takes default <refspec>s from `Pull:` lines, it
48
-merges only the first <refspec> found into the current branch,
49
-after fetching all the remote refs. This is because making an
47
+if you list more than one remote ref, 'git pull' will create
48
+an Octopus merge. On the other hand, if you do not list any
49
+explicit <refspec> parameter on the command line, 'git pull'
50
+will fetch all the <refspec>s it finds in the
51
+`remote.<repository>.fetch` configuration and merge
52
+only the first <refspec> found into the current branch.
53
+This is because making an
54
Octopus from remote refs is rarely done, while keeping track
55
of multiple remote heads in one-go by fetching more than one
56
is often useful.
57
+endif::git-pull[]
58
+
59
Some short-cut notations are also supported.
60
+