diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-03 19:20:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-06 21:52:08 -0800 |
| commit | 1cb303872ab1ba73fcc52167c61fc4211c843cf5 (patch) | |
| tree | 78f03d7caf31e0194fe4a978f429925dfa9157dd /git-merge.sh | |
| parent | 1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f (diff) | |
| download | git-1cb303872ab1ba73fcc52167c61fc4211c843cf5.tar.gz git-1cb303872ab1ba73fcc52167c61fc4211c843cf5.tar.xz | |
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>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions