diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-21 14:55:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-21 14:55:01 -0800 |
| commit | 4fcc0911989493e6e818dd933133cb18a32131fc (patch) | |
| tree | c3a388f1064d51fdfd1b9b99a75947be01dd42b8 /builtin/merge.c | |
| parent | Second batch for 2.12 (diff) | |
| parent | Revert "sequencer: remove useless get_dir() function" (diff) | |
| download | tgif-4fcc0911989493e6e818dd933133cb18a32131fc.tar.xz | |
Merge branch 'sb/sequencer-abort-safety'
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: remove useless get_dir() function
sequencer: make sequencer abort safer
t3510: test that cherry-pick --abort does not unsafely change HEAD
am: change safe_to_abort()'s not rewinding error into a warning
am: fix filename in safe_to_abort() error message
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions