diff options
Diffstat (limited to 'sequencer.h')
-rw-r--r-- | sequencer.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index 1898158..a800cb5 100644 --- a/sequencer.h +++ b/sequencer.h @@ -63,6 +63,13 @@ int sequencer_remove_state(struct replay_opts *opts); #define TODO_LIST_KEEP_EMPTY (1U << 0) #define TODO_LIST_SHORTEN_IDS (1U << 1) #define TODO_LIST_ABBREVIATE_CMDS (1U << 2) +#define TODO_LIST_REBASE_MERGES (1U << 3) +/* + * When rebasing merges, commits that do have the base commit as ancestor + * ("cousins") are *not* rebased onto the new base by default. If those + * commits should be rebased onto the new base, this flag needs to be passed. + */ +#define TODO_LIST_REBASE_COUSINS (1U << 4) int sequencer_make_script(FILE *out, int argc, const char **argv, unsigned flags); |