From mboxrd@z Thu Jan  1 00:00:00 1970
From: Detlev Zundel <dzu@denx.de>
Date: Mon, 29 Mar 2010 11:32:23 +0200
Subject: [U-Boot] git merge summary
In-Reply-To: <4BAFC7A6.1060805@ahsoftware.de> (Alexander Holler's message of
	"Sun, 28 Mar 2010 23:18:30 +0200")
References: <4BAFC7A6.1060805@ahsoftware.de>
Message-ID: <m2mxxreamw.fsf@ohwell.denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

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