Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'

[thirdparty/git.git] / revision.h

diff --git a/revision.h b/revision.h
index f0b8ea7bfa205dc776a6f8e20a2032142db35f9f..b6421a64321168237443ecb7e56e6b0765256c8b 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -15,6 +15,9 @@
 #define SYMMETRIC_LEFT (1u<<8)
 #define ALL_REV_FLAGS  ((1u<<9)-1)
 
+#define DECORATE_SHORT_REFS    1
+#define DECORATE_FULL_REFS     2
+
 struct rev_info;
 struct log_info;
 
@@ -78,7 +81,8 @@ struct rev_info {
                        show_merge:1,
                        abbrev_commit:1,
                        use_terminator:1,
-                       missing_newline:1;
+                       missing_newline:1,
+                       date_mode_explicit:1;
        enum date_mode date_mode;
 
        unsigned int    abbrev;