From: Ralf Thielow <ralf.thielow@googlemail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: fmt-merge-message: add empty line between tag and signature verification
Date: Fri, 25 May 2012 20:35:30 +0200 [thread overview]
Message-ID: <CAN0XMO+LH9ZYSAtRVLOPU3p0bP4mryHkML2wi1KhNEui+AL=uA@mail.gmail.com> (raw)
In-Reply-To: <7vtxz4tcmn.fsf@alter.siamese.dyndns.org>
On Fri, May 25, 2012 at 7:05 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Btw, I'd also like to see the merge notes (notably the conflict file list)
>> before the generated shortlog, but that seems to really not work with the
>> current fmt-merge-message model. Oh well.
>
> Postponing to assess if such a change is feasible, I am not sure if that
> ordering makes more sense than the current one. Is the objective to more
> strongly motivate people to explain what happened to the conflicts?
IMHO it only makes sense when you have a short list of conflicted files.
I mostly work on Java projects and when we merge a branch this list can
be very long. This is caused by several tools, different IDEs, different OSes
and so on and so forth. Anyway...
What I want to see on a merge like this is the shortlog. I only become
interested in
the conflicts if there is an issue in the software caused by a
conflict resolution.
Just my experience on Java projects I'm working on.
prev parent reply other threads:[~2012-05-25 18:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-25 16:02 fmt-merge-message: add empty line between tag and signature verification Linus Torvalds
2012-05-25 17:05 ` Junio C Hamano
2012-05-25 17:20 ` Linus Torvalds
2012-05-25 18:06 ` Martin Fick
2012-05-25 18:35 ` Ralf Thielow [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAN0XMO+LH9ZYSAtRVLOPU3p0bP4mryHkML2wi1KhNEui+AL=uA@mail.gmail.com' \
--to=ralf.thielow@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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 NNTP newsgroup(s).