diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-12 08:33:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-12 08:33:30 -0700 |
| commit | d844808bb2d3c8df0eba23ec1950bc9cf2727452 (patch) | |
| tree | d65872288393e3dc11259e085e4d99261110d73c /builtin | |
| parent | Merge branch 'js/maint-fast-export-mark-error' (diff) | |
| parent | fmt-merge-msg: make attribution into comment lines (diff) | |
| download | tgif-d844808bb2d3c8df0eba23ec1950bc9cf2727452.tar.xz | |
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')
| -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 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); } |