Merge branch 'jn/auto-depend-workaround-buggy-ccache'

diff --git a/builtin/merge.c b/builtin/merge.c
index d7baa2683cdef94bd1e2411503b75e29e120f543..7c8922c8b0b44307a0dbb43329301ad7d1654a46 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1221,6 +1221,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                        memset(&opts, 0, sizeof(opts));
                        opts.add_title = !have_message;
                        opts.shortlog_len = shortlog_len;
+                       opts.credit_people = (0 < option_edit);
 
                        fmt_merge_msg(&merge_names, &merge_msg, &opts);
                        if (merge_msg.len)