diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2008-03-03 17:52:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-03 21:40:15 (GMT) |
| commit | 81646ad247955a8343b58f05f12157dacabe1e5e (patch) | |
| tree | 3fbf74d61197648ff1259f051db267a57884e4c8 /command-list.txt | |
| parent | e6d1f76ccf9de037c5479acdd9b6211e80145142 (diff) | |
| download | git-81646ad247955a8343b58f05f12157dacabe1e5e.zip git-81646ad247955a8343b58f05f12157dacabe1e5e.tar.gz git-81646ad247955a8343b58f05f12157dacabe1e5e.tar.bz2 | |
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 'command-list.txt')
0 files changed, 0 insertions, 0 deletions