| commit | 81646ad247955a8343b58f05f12157dacabe1e5e | |
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | |
| Mon, 3 Mar 2008 17:52:49 +0000 (3 18:52 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Mar 2008 21:40:15 +0000 (3 13:40 -0800) | ||
| tree | 3fbf74d61197648ff1259f051db267a57884e4c8 | treesnapshot (tar.gz zip) |
| parent | e6d1f76ccf9de037c5479acdd9b6211e80145142 | commitdiff |
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>
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>
| Documentation/git-merge.txt | diffblobblamehistory |