From 3c64314c4b1f90488391a0ffea2a4ed04c8f6b79 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Tue, 1 Nov 2005 21:45:55 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git-merge.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Documentation/git-merge.txt') diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index a007a8b15a..8c9c4d87e3 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -28,6 +28,11 @@ OPTIONS there is no `-s` option, built-in list of strategies is used instead. +:: + The commit message to be used for the merge commit (in case + it is created). The `git-fmt-merge-msg` script can be used + to give a good default for automated `git-merge` invocations. + :: our branch head commit. @@ -37,6 +42,11 @@ OPTIONS obviously means you are trying an Octopus. +SEE ALSO +-------- +gitlink:git-fmt-merge-msg[1] + + Author ------ Written by Junio C Hamano -- cgit v1.2.3