rebase -i: Retain user-edited commit messages after squash/fixup conflicts

diff --git a/revision.h b/revision.h
index 921656aaabe74adaf24c8a14426f9533040a4669..d368003159738570220c0e4713efd91f83303339 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -84,6 +84,8 @@ struct rev_info {
                        use_terminator:1,
                        missing_newline:1,
                        date_mode_explicit:1;
+       unsigned int    disable_stdin:1;
+
        enum date_mode date_mode;
 
        unsigned int    abbrev;
@@ -129,8 +131,6 @@ struct rev_info {
 #define REV_TREE_DIFFERENT     3       /* Mixed changes */
 
 /* revision.c */
-void read_revisions_from_stdin(struct rev_info *revs);
-
 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
 extern volatile show_early_output_fn_t show_early_output;