From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
git@vger.kernel.org, Jeff King <peff@peff.net>,
Johannes Sixt <j6t@kdbg.org>
Subject: Re: [PATCH/RFC] fmt-merge-msg: add a blank line after people info
Date: Wed, 06 Jun 2012 14:11:06 -0700 [thread overview]
Message-ID: <7vfwa8kuxh.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20120606204659.GA13858@burratino> (Jonathan Nieder's message of "Wed, 6 Jun 2012 15:46:59 -0500")
Jonathan Nieder <jrnieder@gmail.com> writes:
> In other words, I think the objection given to the patch upthread was
> a real one, but that a more appropriate fix than using strange spacing
> would be to combine statistics from all branches being merged.
It may be real for _you_ but not for everybody. Especially, the
current spacing is a lot more logically consistent than your Fred
the Clown example, which *does* use much more strange spacing.
I do not deeply care either way, so let's do this sometime when the
tree is calm (but not today).
builtin/fmt-merge-msg.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index bf93b04..2c4d435 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);
}
next prev parent reply other threads:[~2012-06-06 21:11 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 3:17 A possible fmt-merge-msg update? Junio C Hamano
2012-03-05 5:24 ` Linus Torvalds
2012-03-05 19:04 ` Junio C Hamano
2012-03-05 20:33 ` Linus Torvalds
2012-03-05 21:34 ` [PATCH] fmt-merge-msg: show those involved in a merged series Junio C Hamano
2012-03-05 21:46 ` Linus Torvalds
2012-03-05 21:49 ` Junio C Hamano
2012-03-07 21:22 ` René Scharfe
2012-03-07 21:59 ` Junio C Hamano
2012-03-08 17:46 ` René Scharfe
2012-03-08 19:18 ` Junio C Hamano
2012-03-08 21:31 ` Junio C Hamano
2012-03-12 21:37 ` Phil Hord
2012-03-13 21:03 ` Jeff King
2012-03-14 3:44 ` Junio C Hamano
2012-03-14 19:12 ` Phil Hord
2012-03-12 7:11 ` Jonathan Nieder
2012-03-13 1:55 ` Junio C Hamano
2012-03-13 5:23 ` Jonathan Nieder
2012-03-13 5:45 ` Junio C Hamano
2012-03-13 7:27 ` Johannes Sixt
2012-03-13 18:26 ` Junio C Hamano
2012-03-14 6:37 ` Johannes Sixt
2012-03-14 20:34 ` Junio C Hamano
2012-03-13 18:28 ` [PATCH v2 1/1] " Junio C Hamano
2012-05-11 10:31 ` [PATCH/RFC] fmt-merge-msg: add a blank line after people info Jonathan Nieder
2012-05-11 22:46 ` Junio C Hamano
2012-05-11 23:20 ` Linus Torvalds
2012-05-14 18:31 ` Junio C Hamano
2012-05-15 20:24 ` Junio C Hamano
2012-05-16 2:02 ` Linus Torvalds
2012-05-16 17:28 ` Junio C Hamano
2012-06-06 20:27 ` Jonathan Nieder
2012-06-06 20:46 ` Jonathan Nieder
2012-06-06 21:11 ` Junio C Hamano [this message]
2012-03-06 7:59 ` A possible fmt-merge-msg update? Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vfwa8kuxh.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).