diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-28 23:29:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-28 23:44:44 (GMT) |
| commit | 9bcbb1c218d075d8b180cfef4c9089f868151e7e (patch) | |
| tree | ebbecac96214b283888b90d0710eddce6e74122a /builtin/merge.c | |
| parent | bafc478f1618534fcb85bedc0fa224bd2d462441 (diff) | |
| download | git-9bcbb1c218d075d8b180cfef4c9089f868151e7e.zip git-9bcbb1c218d075d8b180cfef4c9089f868151e7e.tar.gz git-9bcbb1c218d075d8b180cfef4c9089f868151e7e.tar.bz2 | |
merge --no-edit: do not credit people involved in the side branch
The credit lines "By" and "Via" to credit authors and committers for
their contributions on the side branch are meant as a hint to the
integrator to decide whom to mention in the log message text. After
the integrator saves the message in the editor, they are meant to go
away and that is why they are commented out.
When a merge is recorded without editing the generated message,
however, its contents do not go through the normal stripspace()
and these lines are left in the merge.
Stop producing them when we know the merge is going to be recorded
without editing, i.e. when --no-edit is given.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 e81fde6..c5d3551 100644 --- 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) |