This series introduces a few options to the sequencer, to allow skipping unwanted/unnecessary commits.
The first patch is just cleanup. The second fixes a potential issue about sequencing options not being correctly remembered across interruptions. The next two introduce cherry-pick options to skip empty (or only redundant) commits. The two options are introduced separately because of the complexity associated with the possible combinations that can be had. The last commit allows --skip as a reset + --continue, to quickly skip the current commit during a failed cherry-pick or revert (for example because a better version of the commit was already merged). Giuseppe Bilotta (5): sequencer: sort options load/save by struct position sequencer: save/load all options cherry-pick: option to skip empty commits cherry-pick: allow skipping only redundant commits sequencer: allow to --skip current commit Documentation/git-cherry-pick.txt | 10 +++ Documentation/sequencer.txt | 10 ++- builtin/revert.c | 24 +++++- sequencer.c | 163 ++++++++++++++++++++++++++++++-------- sequencer.h | 4 +- 5 files changed, 176 insertions(+), 35 deletions(-) -- 2.11.0.616.gd72966cf44.dirty
