summaryrefslogtreecommitdiff
path: root/t/t556x_common
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2010-02-11 16:08:15 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-11 22:11:04 -0800
commit97915544f84132b210a336d5877fafd7cb104abe (patch)
tree9e3dcb69a0b25e2f57d1906f97e5c67f0b74f719 /t/t556x_common
parentcherry-pick: format help message as strbuf (diff)
downloadtgif-97915544f84132b210a336d5877fafd7cb104abe.tar.xz
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>
Diffstat (limited to 't/t556x_common')
0 files changed, 0 insertions, 0 deletions