fetch/pull doc: untangle meaning of bare <ref>
The documentation erroneously used the same wording for both fetch and pull, stating that something will be merged even in git-fetch(1). In addition, saying that "<ref> is equivalent to <ref>:" doesn't really help anyone who still needs to read manpages. Clarify what is actually going on. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast committed
May 11, 2013 at 18:14 UTC
4ab90e7a5c46ce929ae8b3b7bbb5b276f2f60e0d
1 file changed
+8
-3
Documentation/pull-fetch-param.txt
+8
-3
@@ -68,6 +68,11 @@ Some short-cut notations are also supported.
68
+
69
* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
70
it requests fetching everything up to the given tag.
71
-* A parameter <ref> without a colon is equivalent to
72
- <ref>: when pulling/fetching, so it merges <ref> into the current
73
- branch without storing the remote branch anywhere locally
71
+ifndef::git-pull[]
72
+* A parameter <ref> without a colon fetches that ref into FETCH_HEAD,
73
+endif::git-pull[]
74
+ifdef::git-pull[]
75
+* A parameter <ref> without a colon merges <ref> into the current
76
+ branch,
77
+endif::git-pull[]
78
+ while not storing the branch anywhere locally.