aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-05 01:37:00 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-05 01:39:18 -0800
commitfdd089793c1d694fa742da51dfbf0227d61d4c0e (patch)
tree1985e77d5440b4b7c570a2cccc1892d32c460188 /Documentation/git-merge.txt
parentbccf5956c323a043e9a5d540b3c842ae6e5e5220 (diff)
downloadgit-fdd089793c1d694fa742da51dfbf0227d61d4c0e.tar.gz
git-fdd089793c1d694fa742da51dfbf0227d61d4c0e.tar.xz
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>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index da6537d91..3e058db99 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