Merge branch 'dl/complete-cherry-pick-revert-skip'

diff --git a/shortlog.h b/shortlog.h
index de4f86fb970e15491f44dfe38b7d7d6fdc3be9ad..2fa61c42946262238ae2f1662ef3c2d1e981b274 100644 (file)
--- a/shortlog.h
+++ b/shortlog.h
@@ -3,6 +3,8 @@
 
 #include "string-list.h"
 
+struct commit;
+
 struct shortlog {
        struct string_list list;
        int summary;
@@ -13,10 +15,12 @@ struct shortlog {
        int in2;
        int user_format;
        int abbrev;
+       int committer;
 
        char *common_repo_prefix;
        int email;
        struct string_list mailmap;
+       FILE *file;
 };
 
 void shortlog_init(struct shortlog *log);