Documentation for git-fmt-merge-msg

[git.git] / Documentation / git-merge.txt
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt

index a007a8b..8c9c4d8 100644 (file)
--- 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>