aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2005-11-01 21:45:55 +0100
committerJunio C Hamano <junkio@cox.net>2005-11-01 14:45:49 -0800
commit3c64314c4b1f90488391a0ffea2a4ed04c8f6b79 (patch)
tree84b5ed3295ea3f148194061c8475e348d3793769 /Documentation/git-merge.txt
parente3a39000e295e4bd6faff97decc31e6cb4520bb1 (diff)
downloadgit-3c64314c4b1f90488391a0ffea2a4ed04c8f6b79.tar.gz
git-3c64314c4b1f90488391a0ffea2a4ed04c8f6b79.tar.xz
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>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index a007a8b15..8c9c4d87e 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.
+<msg>::
+ 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.
+
<head>::
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 <junkio@cox.net>