From: Andrew Ruder <andy@aeruder.net>
Date: Fri, 27 Apr 2007 04:58:57 +0000 (-0500)
Subject: Update git-fmt-merge documentation
X-Git-Tag: v1.5.1.3~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2bc060cc6fce9f51240bf35803a5690dd1813c7c?hp=2bc060cc6fce9f51240bf35803a5690dd1813c7c

Update git-fmt-merge documentation

Documentation/git-fmt-merge-msg.txt:
--summary to list commit summaries on merge
--no-summary
--file to take merged objects from a file.
Configuration option merge.summary

Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---