| commit | 1cb303872ab1ba73fcc52167c61fc4211c843cf5 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 4 Feb 2006 03:20:16 +0000 (3 19:20 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 7 Feb 2006 05:52:08 +0000 (6 21:52 -0800) | ||
| tree | 78f03d7caf31e0194fe4a978f429925dfa9157dd | treesnapshot (tar.gz zip) |
| parent | 1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f | commitdiff |
fmt-merge-msg: show summary of what is merged.
In addition to the branch names, populate the log message with
one-line description from actual commits that are being merged.
This was prompted by Len's 12-way octopus. You need to have
'merge.summary' in the configuration file to enable it:
$ git repo-config merge.summary yes
Signed-off-by: Junio C Hamano <junkio@cox.net>
In addition to the branch names, populate the log message with
one-line description from actual commits that are being merged.
This was prompted by Len's 12-way octopus. You need to have
'merge.summary' in the configuration file to enable it:
$ git repo-config merge.summary yes
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-fmt-merge-msg.perl | diffblobblamehistory |