2 Commits

Author	SHA1	Message	Date
Andrew Ruder	2bc060cc6f	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>	2007-04-26 22:43:10 -07:00
Petr Baudis	3c64314c4b	Documentation for git-fmt-merge-msg ... Simple description. It appears to be mostly internal command, but hey, it is (it seems) the only undocumented one, so let's fix it up... Also add a note about it to git-merge documentation. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-11-01 14:45:49 -08:00