@matheusbsbs / matheus-bagliano / commits / fdd089793c
Fork 0

Documentation: git-fetch/pull updates.

We do not accept multiple <refspecs> on one Pull:/Push: line right now (we could lift this tentative workaround for the broken refnames), but we have always accepted multiple such lines, so use that form in the examples and discussion. Also explicitly mention that Octopus is made only with an explicit command line request and never from Pull: lines. Add a couple of cross references. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Nov 5, 2005 at 01:37 UTC fdd089793c1d694fa742da51dfbf0227d61d4c0e
4 files changed +30 -4
Documentation/git-fetch.txt
+5
@@ -37,6 +37,11 @@ include::pull-fetch-param.txt[]
37 update the index and working directory, so use it with care.
38
39
40 +SEE ALSO
41 +--------
42 +gitlink:git-pull[1]
43 +
44 +
45 Author
46 ------
47 Written by Linus Torvalds <torvalds@osdl.org> and
Documentation/git-merge.txt
+1 -1
@@ -37,7 +37,7 @@ include::merge-pull-opts.txt[]
37
38 SEE ALSO
39 --------
40 -gitlink:git-fmt-merge-msg[1]
40 +gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1]
41
42
43 Author
Documentation/git-pull.txt
+5
@@ -141,6 +141,11 @@ merge the remote `origin` head into the current,
141 local `master` branch.
142
143
144 +SEE ALSO
145 +--------
146 +gitlink:git-fetch[1], gitlink:git-merge[1]
147 +
148 +
149 Author
150 ------
151 Written by Linus Torvalds <torvalds@osdl.org>
Documentation/pull-fetch-param.txt
+19 -3
@@ -17,12 +17,12 @@ file in `$GIT_DIR/remotes` directory can be given; the
17 named file should be in the following format:
18 +
19 URL: one of the above URL format
20 - Push: <refspec>...
21 - Pull: <refspec>...
20 + Push: <refspec>
21 + Pull: <refspec>
22 +
23 When such a short-hand is specified in place of
24 <repository> without <refspec> parameters on the command
25 -line, <refspec>... specified on `Push:` lines or `Pull:`
25 +line, <refspec> specified on `Push:` lines or `Pull:`
26 lines are used for `git-push` and `git-fetch`/`git-pull`,
27 respectively. Multiple `Push:` and and `Pull:` lines may
28 be specified for additional branch mappings.
@@ -91,6 +91,22 @@ remote `master` branch to a local `origin` branch, which
91 is then merged to a local development branch, again typically
92 named `master`.
93 +
94 +[NOTE]
95 +There is a difference between listing multiple <refspec>
96 +directly on `git-pull` command line and having multiple
97 +`Pull:` <refspec> lines for a <repository> and running
98 +`git-pull` command without any explicit <refspec> parameters.
99 +<refspec> listed explicitly on the command line are always
100 +merged into the current branch after fetching. In other words,
101 +if you list more than one remote refs, you would be making
102 +an Octopus. While `git-pull` run without any explicit <refspec>
103 +parameter takes default <refspec>s from `Pull:` lines, it
104 +merges only the first <refspec> found into the current branch,
105 +after fetching all the remote refs. This is because making an
106 +Octopus from remote refs is rarely done, while keeping track
107 +of multiple remote heads in one-go by fetching more than one
108 +is often useful.
109 ++
110 Some short-cut notations are also supported.
111 +
112 * For backward compatibility, `tag` is almost ignored;