Merge git-gui into ml/git-gui-exec-path-fix

[thirdparty/git.git] / shortlog.h

diff --git a/shortlog.h b/shortlog.h
index 3f7e9aabcaef4b1ff2e5a5122cbea8bc97a6b7d5..28d04f951af73d8f9bdf58f6100a5eb3fe51b72c 100644 (file)
--- a/shortlog.h
+++ b/shortlog.h
@@ -2,6 +2,7 @@
 #define SHORTLOG_H
 
 #include "string-list.h"
+#include "date.h"
 
 struct commit;
 
@@ -15,13 +16,16 @@ struct shortlog {
        int in2;
        int user_format;
        int abbrev;
+       struct date_mode date_mode;
 
        enum {
                SHORTLOG_GROUP_AUTHOR = (1 << 0),
                SHORTLOG_GROUP_COMMITTER = (1 << 1),
                SHORTLOG_GROUP_TRAILER = (1 << 2),
+               SHORTLOG_GROUP_FORMAT = (1 << 3),
        } groups;
        struct string_list trailers;
+       struct string_list format;
 
        int email;
        struct string_list mailmap;
@@ -29,6 +33,7 @@ struct shortlog {
 };
 
 void shortlog_init(struct shortlog *log);
+void shortlog_finish_setup(struct shortlog *log);
 
 void shortlog_add_commit(struct shortlog *log, struct commit *commit);