summaryrefslogtreecommitdiff
path: root/t/t1200-tutorial.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-04 03:20:16 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-07 05:52:08 (GMT)
commit1cb303872ab1ba73fcc52167c61fc4211c843cf5 (patch)
tree78f03d7caf31e0194fe4a978f429925dfa9157dd /t/t1200-tutorial.sh
parent1b1fdf8c2f935e2195d3ca5c37e578bd9146a82f (diff)
downloadgit-1cb303872ab1ba73fcc52167c61fc4211c843cf5.zip
git-1cb303872ab1ba73fcc52167c61fc4211c843cf5.tar.gz
git-1cb303872ab1ba73fcc52167c61fc4211c843cf5.tar.bz2
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 't/t1200-tutorial.sh')
0 files changed, 0 insertions, 0 deletions