Andrew's git / gitweb.git / blobdiff
?
Update howto using-topic-branches
[gitweb.git] / Documentation / git-merge.txt
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 8c9c4d87e359041b8f10b2ec5f13ee4217fae3bc..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,7 @@ which drives multiple merge strategy scripts.
 
 OPTIONS
 -------
--n::
-       Do not show diffstat at the end of the merge.
-
--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.
+include::merge-options.txt[]
 
 <msg>::
        The commit message to be used for the merge commit (in case
@@ -41,10 +34,12 @@ 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-fmt-merge-msg[1], gitlink:git-pull[1]
 
 
 Author