git-rebase.txt: address confusion between --no-ff vs --force-rebase

diff --git a/sequencer.h b/sequencer.h
index a800cb57558fab14d43cda47c9a69b3c5015e1a8..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;
 };