Merge branch 'ss/commit-squash-msg' into maint

diff --git a/revision.h b/revision.h
index 1b58aacc03bd330ebf70ee71aac0d38fd18743c7..dca0d381715cf5bc6888587feaec989012f51252 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -135,6 +135,7 @@ struct rev_info {
                        pretty_given:1,
                        abbrev_commit:1,
                        abbrev_commit_given:1,
+                       zero_commit:1,
                        use_terminator:1,
                        missing_newline:1,
                        date_mode_explicit:1,
@@ -146,7 +147,7 @@ struct rev_info {
                        track_first_time:1,
                        linear:1;
 
-       enum date_mode date_mode;
+       struct date_mode date_mode;
 
        unsigned int    abbrev;
        enum cmit_fmt   commit_format;