| commit | 539047c19ec040819b6f6af2d55714195b812abb | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Wed, 23 Nov 2011 01:27:21 +0000 (22 19:27 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Nov 2011 02:16:59 +0000 (22 18:16 -0800) | ||
| tree | d84dbed3909b0311fc9108dc5c96c87a51394288 | treesnapshot (tar.gz zip) |
| parent | 82433cdf4d888639cecddeca162d619cf370417e | commitdiff |
revert: introduce --abort to cancel a failed cherry-pick
After running some ill-advised command like "git cherry-pick
HEAD..linux-next", the bewildered novice may want to return to more
familiar territory. Introduce a "git cherry-pick --abort" command
that rolls back the entire cherry-pick sequence and places the
repository back on solid ground.
Just like "git merge --abort", this internally uses "git reset
--merge", so local changes not involved in the conflict resolution are
preserved.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
After running some ill-advised command like "git cherry-pick
HEAD..linux-next", the bewildered novice may want to return to more
familiar territory. Introduce a "git cherry-pick --abort" command
that rolls back the entire cherry-pick sequence and places the
repository back on solid ground.
Just like "git merge --abort", this internally uses "git reset
--merge", so local changes not involved in the conflict resolution are
preserved.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>