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
This commit is contained in:
Junio C Hamano
2012-06-12 08:33:30 -07:00
2 changed files with 20 additions and 20 deletions

View File

@ -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);
}