checkout.h: wrap the arguments to unique_tracking_name()

diff --git a/sequencer.h b/sequencer.h
index 1898158c52d61e54de2180546c2e051942d578ef..c5787c6b566bbc89caad1a099f4281fecba01766 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -48,6 +48,10 @@ struct replay_opts {
        struct strbuf current_fixups;
        int current_fixup_count;
 
+       /* placeholder commit for -i --root */
+       struct object_id squash_onto;
+       int have_squash_onto;
+
        /* Only used by REPLAY_NONE */
        struct rev_info *revs;
 };
@@ -63,6 +67,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);