Merge branch 'jc/comment-cygwin-win32api-in-makefile'

diff --git a/builtin.h b/builtin.h
index 3faf9d6691413c006f4c82702aa5e0c5e4bc88a0..7e7bbd665a905b0fdf9ce5351f6f09dfd3dd7e8a 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -15,7 +15,8 @@ extern const char git_more_info_string[];
 extern void prune_packed_objects(int);
 
 struct fmt_merge_msg_opts {
-       unsigned add_title:1;
+       unsigned add_title:1,
+               credit_people:1;
        int shortlog_len;
 };