Andrew's git / gitweb.git / blobdiff
?
git-merge-ours: make sure our index matches HEAD
[gitweb.git] / Documentation / git-merge.txt
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index dca363dd5ec7022d605d5730be65e6066072de1d..8c9c4d87e359041b8f10b2ec5f13ee4217fae3bc 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -1,6 +1,5 @@
 git-merge(1)
 ============
-v0.99.6, Sep 2005
 
 NAME
 ----
@@ -29,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.
 
@@ -38,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>