summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
Commit message (Collapse)AuthorAgeFilesLines
* Documentation: Added [verse] to SYNOPSIS where necessaryMatthias Kestenholz2007-05-181-0/+1
| | | | | Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git-fmt-merge documentationAndrew Ruder2007-04-261-1/+24
| | | | | | | | | | | 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>
* Documentation for git-fmt-merge-msgPetr Baudis2005-11-011-0/+39
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>