diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-10 21:46:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-10 21:46:29 (GMT) |
| commit | cf6c52fce8bf0870069b630a2e199483f8f9faac (patch) | |
| tree | 99a52b465c95f4a85316772425cf8ce173125b18 /builtin/merge.c | |
| parent | 44fe83502edf5391bb3a5997cab01794b4568062 (diff) | |
| parent | 9bcbb1c218d075d8b180cfef4c9089f868151e7e (diff) | |
| download | git-cf6c52fce8bf0870069b630a2e199483f8f9faac.zip git-cf6c52fce8bf0870069b630a2e199483f8f9faac.tar.gz git-cf6c52fce8bf0870069b630a2e199483f8f9faac.tar.bz2 | |
Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'
Stop spending cycles to compute information to be placed on
commented lines in "merge --no-edit", which will be discarded
anyway.
* jc/maint-fmt-merge-msg-no-edit-lose-credit:
merge --no-edit: do not credit people involved in the side branch
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 3a31c4b..9307e9c 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1222,6 +1222,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) |