![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Jeff King <peff@peff.net> | |
| Thu, 11 Feb 2010 21:08:15 +0000 (16:08 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Feb 2010 06:11:04 +0000 (22:11 -0800) | ||
| commit | 97915544f84132b210a336d5877fafd7cb104abe | |
| tree | 9e3dcb69a0b25e2f57d1906f97e5c67f0b74f719 | tree | snapshot |
| parent | 08565bdb4b5d1da597ed8b90d1a23729f7c006d0 | commit | diff |
cherry-pick: show commit name instead of sha1
When we have a conflict, we advise the user to do:
git commit -c $sha1
This works fine, but is unnecessarily confusing and annoying
for the user to type, when:
git commit -c $the_thing_you_called_cherry_pick_with
works just as well.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When we have a conflict, we advise the user to do:
git commit -c $sha1
This works fine, but is unnecessarily confusing and annoying
for the user to type, when:
git commit -c $the_thing_you_called_cherry_pick_with
works just as well.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-revert.c | diff | blob | history |