diff options
author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2008-03-03 18:52:49 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-03-03 13:40:15 -0800 |
commit | 81646ad247955a8343b58f05f12157dacabe1e5e (patch) | |
tree | 3fbf74d61197648ff1259f051db267a57884e4c8 /sha1_name.c | |
parent | git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options (diff) | |
download | tgif-81646ad247955a8343b58f05f12157dacabe1e5e.tar.xz |
Fix incorrect wording in git-merge.txt.
A merge is not necessarily with a remote branch, it can be with any
commit.
Thanks to Paolo Ciarrocchi for pointing out the problem, and to
Nicolas Pitre for pointing out the fact that a merge is not
necessarily with a branch head.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
0 files changed, 0 insertions, 0 deletions