public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Detlev Zundel <dzu@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] git merge summary
Date: Mon, 29 Mar 2010 11:32:23 +0200	[thread overview]
Message-ID: <m2mxxreamw.fsf@ohwell.denx.de> (raw)
In-Reply-To: <4BAFC7A6.1060805@ahsoftware.de> (Alexander Holler's message of "Sun, 28 Mar 2010 23:18:30 +0200")

Hi Alexander,

> may I ask if there is reason why merge commits don't have a summary?

Yes, you may.  Actually this is a good question.

> I find those summaries (enabled with git config [--global] merge.summary 
> true) very hand to see what was changed with the merge commit.

I didn't even know about that feature, so thanks for poking us.
Checking the documentation, it seems like the name will change soon
however (man git-fmt-merge-msg):

       merge.summary
           Synonym to merge.log; this is deprecated and will be removed
           in the future.

But apart from that, I also like the feature.  Wolfgang, what do you
think?

Cheers
  Detlev

-- 
Mit einem Leben wie dem meinen, Doktor - wer braucht da noch Traeume?
                                            - Alex Portnoy
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de

  reply	other threads:[~2010-03-29  9:32 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-28 21:18 [U-Boot] git merge summary Alexander Holler
2010-03-29  9:32 ` Detlev Zundel [this message]
2010-03-29 10:44   ` Wolfgang Denk
2010-12-18 22:50   ` Alexander Holler
2010-12-21 14:00     ` Detlev Zundel
2010-12-21 14:36       ` Wolfgang Denk
2010-12-21 15:24         ` Detlev Zundel
2011-01-09 16:25       ` Wolfgang Denk
2011-01-10  5:20         ` Mike Frysinger
2011-01-12 17:47         ` Detlev Zundel
2011-01-12 18:13           ` Stefan Roese
2011-03-11  0:34             ` Alexander Holler

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=m2mxxreamw.fsf@ohwell.denx.de \
    --to=dzu@denx.de \
    --cc=u-boot@lists.denx.de \
    /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