X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fsequencer.txt;h=5747f442f25e6271c7464db78496b85ee058d05f;hb=aa9828561e562a0b9ca559be4225de679b8e8be3;hp=3e6df338bed519eb74cf233f40589ddbfb0da57b;hpb=6f55f0281558f56a0141f3058f245d0877e80efb;p=git.git diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.txt index 3e6df338b..5747f442f 100644 --- a/Documentation/sequencer.txt +++ b/Documentation/sequencer.txt @@ -1,9 +1,12 @@ ---reset:: - Forget about the current operation in progress. Can be used - to clear the sequencer state after a failed cherry-pick or - revert. - --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.