Update git-fmt-merge documentation
authorAndrew Ruder <andy@aeruder.net>
Fri, 27 Apr 2007 04:58:57 +0000 (23:58 -0500)
committerJunio C Hamano <junkio@cox.net>
Fri, 27 Apr 2007 05:43:10 +0000 (22:43 -0700)
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>
No differences found