mirror of
https://github.com/git/git.git
synced 2024-11-14 13:13:01 +01:00
539047c19e
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>
12 lines
392 B
Text
12 lines
392 B
Text
--continue::
|
|
Continue the operation in progress using the information in
|
|
'.git/sequencer'. Can be used to continue after resolving
|
|
conflicts in a failed cherry-pick or revert.
|
|
|
|
--quit::
|
|
Forget about the current operation in progress. Can be used
|
|
to clear the sequencer state after a failed cherry-pick or
|
|
revert.
|
|
|
|
--abort::
|
|
Cancel the operation and return to the pre-sequence state.
|