projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3074f94 ce73bb2)
Merge branch 'sb/sequencer-abort-safety' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:33:02 +0000 (15:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:33:02 +0000 (15:33 -0800)
commitec71fb1217fe1cf4503d38edf67118ff708ab99c
tree7a39d24216c1a27095ac6434688b09c08912e21etree | snapshot
parent3074f9477c394cb6e81d163f738566535afd22edcommit | diff
parentce73bb22d87abe16885b3e871a10de5a261e499fcommit | diff
Merge branch 'sb/sequencer-abort-safety' into next

Unlike "git am --abort", "git cherry-pick --abort" moved HEAD back
to where cherry-pick started while picking multiple changes, when
the cherry-pick stopped to ask for help from the user, and the user
did "git reset --hard" to a different commit in order to re-attempt
the operation.

* sb/sequencer-abort-safety:
  Revert "sequencer: remove useless get_dir() function"
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.