Merge branch 'va/p4-branch-import'

diff --git a/revision.h b/revision.h
index 4499cebded6bc4348c0648a77d6e0dae4cf00acf..3d64adad18e2c889b7a7b7367f99c239f958dc70 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -94,7 +94,8 @@ struct rev_info {
                        abbrev_commit_given:1,
                        use_terminator:1,
                        missing_newline:1,
-                       date_mode_explicit:1;
+                       date_mode_explicit:1,
+                       preserve_subject:1;
        unsigned int    disable_stdin:1;
 
        enum date_mode date_mode;