diff options
| author | Thomas Rast <trast@inf.ethz.ch> | 2013-05-11 18:14:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-12 15:23:47 -0700 |
| commit | 4ab90e7a5c46ce929ae8b3b7bbb5b276f2f60e0d (patch) | |
| tree | 0eb153d6ea7732416a7915fdc1e685f5d542e00f | |
| parent | 51f8c814d5603a917a91a47019875bbe707675bb (diff) | |
| download | git-4ab90e7a5c46ce929ae8b3b7bbb5b276f2f60e0d.tar.gz | |
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>
| -rw-r--r-- | Documentation/pull-fetch-param.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index 94a9d32f1d..6f5ca21748 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -68,6 +68,11 @@ Some short-cut notations are also supported. + * `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests fetching everything up to the given tag. -* A parameter <ref> without a colon is equivalent to - <ref>: when pulling/fetching, so it merges <ref> into the current - branch without storing the remote branch anywhere locally +ifndef::git-pull[] +* A parameter <ref> without a colon fetches that ref into FETCH_HEAD, +endif::git-pull[] +ifdef::git-pull[] +* A parameter <ref> without a colon merges <ref> into the current + branch, +endif::git-pull[] + while not storing the branch anywhere locally. |