summaryrefslogtreecommitdiff
path: root/Documentation/sequencer.txt
blob: 3e6df338bed519eb74cf233f40589ddbfb0da57b (plain)
1
2
3
4
5
6
7
8
9
--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.