| commit | 76bf488e61b8a87191a1779b79820545e64ef275 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 2 Dec 2009 17:59:35 +0000 (2 09:59 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 2 Dec 2009 18:01:59 +0000 (2 10:01 -0800) | ||
| tree | 182ca04d19ef735865aab0f9c075020c0b4a7b1d | treesnapshot (tar.gz zip) |
| parent | af6fbf9f814b3ee23b4b6d632131095c0278ae44 | commitdiff |
Do not misidentify "git merge foo HEAD" as an old-style invocation
This was misinterpreted as an ancient style "git merge <message> HEAD
<commit> <commit>..." that merges one (or more) <commit> into the current
branch and record the resulting commit with the given message. Then a
later sanity check found that there is no <commit> specified and gave
a usage message.
Tested-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This was misinterpreted as an ancient style "git merge <message> HEAD
<commit> <commit>..." that merges one (or more) <commit> into the current
branch and record the resulting commit with the given message. Then a
later sanity check found that there is no <commit> specified and gave
a usage message.
Tested-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-merge.c | diffblobblamehistory |