[U-Boot] git merge summary

[Wolfgang Denk]

In message <m2mxxreamw.fsf at ohwell.denx.de> Detlev Zundel wrote:
> 
> > 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?

I have no preference.

If there is an agreement (or at least no protests) we can add
'merge.log'.

Shall we?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Prof:        So the American government went to IBM to come up with a
             data encryption standard and they came up with ...
Student:     EBCDIC!