Re: How to enhance merge commit message ?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Alexander Litvinov <litvinov2004@xxxxxxxxx> writes:

> git's git repo contains a lot of merges with nice commit message, 
> like this (d96497b8d):
> ....
> How can I made the same messages using git pull . <branch> ?

$ grep -A2 '^merge\.summary' Documentation/config.txt
merge.summary::
	Whether to include summaries of merged commits in newly created
	merge commit messages. False by default.

This is a good option if you are doing the top-level "bundling
of others' work -- people will base their further work on this"
merges.  On the other hand, if you are merging from your uplevel
because your work depends on something that was updated recently,
having the merge summary is often pointless (because the merge
would bring in many mostly unrelated commits, in addition to that
something your work depends on).  I think Linus has explicitly
asked this option not enabled by people he pulls from for this
reason.

We might want to have a per-branch option to control this
behaviour at finer grained level.  I would enable it for my four
primary integration branches (maint, master, next, and pu) but
not for topic branches.  That way, if a topic needs a fix that
happened on the master since it forked, the tip of the master
will be merged back to the topic without the merge summary
message (I would describe why that merge in an unusual direction
was needed in the commit message anyway).


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]