diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-06 14:24:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-06 14:46:35 -0700 |
| commit | 9830a9ca50ae269aa8858df596e32506c97cdd26 (patch) | |
| tree | 9298126b736316d4eee7643cf4166019995218a4 /builtin/fmt-merge-msg.c | |
| parent | 418a1435f19b8105de2ee94b54cc2962bc9b5f03 (diff) | |
| download | git-9830a9ca50ae269aa8858df596e32506c97cdd26.tar.gz git-9830a9ca50ae269aa8858df596e32506c97cdd26.tar.xz | |
fmt-merge-msg: make attribution into comment lines
The submaintainer credit is not something you can compute purely by
looking at the history and its shape, especially in the presense of
fast-forward merges, and this observation makes the information on
the "via" line unreliable. Let's leave the final determination of
credits up to whoever is making the merge and show them as comments.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fmt-merge-msg.c')
| -rw-r--r-- | builtin/fmt-merge-msg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index 1bc6b8b8c..c90f6d685 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -243,10 +243,10 @@ static void credit_people(struct strbuf *out, const char *me; if (kind == 'a') { - label = "\nBy "; + label = "\n# By "; me = git_author_info(IDENT_NO_DATE); } else { - label = "\nvia "; + label = "\n# Via "; me = git_committer_info(IDENT_NO_DATE); } |