Merge branch 'jk/commit-how-to-abort-cherry-pick'
commitaf77c0b1cf3f8c8ba5ae30cec208227800447f99
authorJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2013 19:38:23 +0000 (31 12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2013 19:38:23 +0000 (31 12:38 -0700)
tree441aabac17ad0a03f69ce7354383708d4372b6bc
parent652d2bfa83e92d871eb034e13fd811fbd402c3f1
parentc17592a7a2420a61c4c407f4cf635f196f1254f3
Merge branch 'jk/commit-how-to-abort-cherry-pick'

* jk/commit-how-to-abort-cherry-pick:
  commit: tweak empty cherry pick advice for sequencer
builtin/commit.c