merge --no-edit: do not credit people involved in the side branch

diff --git a/builtin/merge.c b/builtin/merge.c
index e81fde6d79e8896235c4a3901bc303f6094a9e55..c5d35515675fca9a17f2782d08da84ce115834e3 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1324,6 +1324,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)