summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-12 08:33:30 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-12 08:33:30 -0700
commitd844808bb2d3c8df0eba23ec1950bc9cf2727452 (patch)
treed65872288393e3dc11259e085e4d99261110d73c /builtin/fmt-merge-msg.c
parent87725757af66f3dd6c4141ebe3e410cb6f2e7210 (diff)
parent9830a9ca50ae269aa8858df596e32506c97cdd26 (diff)
downloadgit-d844808bb2d3c8df0eba23ec1950bc9cf2727452.tar.gz
Merge branch 'jc/fmt-merge-msg-people'
Tone down the lines that credit people involved and make them comments, so that integrators who edit their merge messages can still make use of the information, but lazy ones will not leave the unverified guesses placed on the "via" line. * jc/fmt-merge-msg-people: fmt-merge-msg: make attribution into comment lines
Diffstat (limited to 'builtin/fmt-merge-msg.c')
-rw-r--r--builtin/fmt-merge-msg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index bf93b043b7..2c4d435da1 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -286,10 +286,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);
}