Merge branch 'ml/filter-branch-no-op-error' into next

diff --git a/sequencer.h b/sequencer.h
index e45b178dfc41d723bf186f20674c4515d7c7fa00..739dd0fa92b263f7c05f9c1d41f840b2f9e41dcd 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -59,6 +59,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_RECREATE_MERGES (1U << 3)
+/*
+ * When recreating 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);