Andrew's git / gitweb.git / blobdiff
?
git-mv: fully detect 'directory moved into itself'
[gitweb.git] / Documentation / git-merge.txt
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index a007a8b15a1a4598aabd844d09e45db65db6e3a5..904e2fc4c5d1d2748e8f34b8df977a88f23233fd 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -8,7 +8,7 @@ git-merge - Grand Unified Merge Driver
 
 SYNOPSIS
 --------
-'git-merge' [-n] [-s <strategy>]... <msg> <head> <remote> <remote>...
+'git-merge' [-n] [--no-commit] [-s <strategy>]... <msg> <head> <remote> <remote>...
 
 
 DESCRIPTION
@@ -19,14 +19,12 @@ which drives multiple merge strategy scripts.
 
 OPTIONS
 -------
--n::
-       Do not show diffstat at the end of the merge.
+include::merge-options.txt[]
 
--s <strategy>::
-       use that merge strategy; can be given more than once to
-       specify them in the order they should be tried.  If
-       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.
@@ -36,6 +34,13 @@ OPTIONS
        least one <remote>.  Specifying more than one <remote>
        obviously means you are trying an Octopus.
 
+include::merge-strategies.txt[]
+
+
+SEE ALSO
+--------
+gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1]
+
 
 Author
 ------