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 /git-merge-octopus.sh | |
| parent | t5510: start tracking-ref tests from a known state (diff) | |
| download | tgif-4ab90e7a5c46ce929ae8b3b7bbb5b276f2f60e0d.tar.xz | |
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>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions