| commit | 6099835c1900876c813be6114ff4e81f6d90e8a3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 7 Sep 2011 18:16:03 +0000 (7 11:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Sep 2011 23:52:43 +0000 (15 16:52 -0700) | ||
| tree | 3ecfdf5de8bf11f8d6abffd91eb4aa2018397ee8 | treesnapshot (tar.gz zip) |
| parent | f696543dad6c7ba27b0c4fab167a5687263a9ba0 | commitdiff |
Allow git merge ":/<pattern>"
It probably is not such a good idea to use ":/<pattern>" to specify which
commit to merge, as ":/<pattern>" can often hit unexpected commits, but
somebody tried it and got a nonsense error message:
fatal: ':/Foo bar' does not point to a commit
So here is a for-the-sake-of-consistency update that is fairly useless
that allows users to carefully try not shooting in the foot.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
It probably is not such a good idea to use ":/<pattern>" to specify which
commit to merge, as ":/<pattern>" can often hit unexpected commits, but
somebody tried it and got a nonsense error message:
fatal: ':/Foo bar' does not point to a commit
So here is a for-the-sake-of-consistency update that is fairly useless
that allows users to carefully try not shooting in the foot.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory | |
| sha1_name.c | diffblobblamehistory |