Merge branch 'maint'

[git.git] / Documentation / merge-options.txt

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 182cef54be5963ff0f32a24329ca195607413e29..9f1fc825503a7c972fe162f4e2a87781e0f783f3 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,3 +1,7 @@
+--summary::
+       Show a diffstat at the end of the merge. The diffstat is also
+       controlled by the configuration option merge.diffstat.
+

 -n, \--no-summary::
        Do not show diffstat at the end of the merge.
 
 -n, \--no-summary::
        Do not show diffstat at the end of the merge.
 


@@ -6,6 +10,10 @@
        not autocommit, to give the user a chance to inspect and
        further tweak the merge result before committing.
 
        not autocommit, to give the user a chance to inspect and
        further tweak the merge result before committing.
 

+--commit::
+       Perform the merge and commit the result. This option can
+       be used to override --no-commit.
+

 --squash::
        Produce the working tree and index state as if a real
        merge happened, but do not actually make a commit or
 --squash::
        Produce the working tree and index state as if a real
        merge happened, but do not actually make a commit or


@@ -15,10 +23,22 @@
        top of the current branch whose effect is the same as
        merging another branch (or more in case of an octopus).
 
        top of the current branch whose effect is the same as
        merging another branch (or more in case of an octopus).
 

+--no-squash::
+       Perform the merge and commit the result. This option can
+       be used to override --squash.
+
+--no-ff::
+       Generate a merge commit even if the merge resolved as a
+       fast-forward.
+
+--ff::
+       Do not generate a merge commit if the merge resolved as
+       a fast-forward, only update the branch pointer. This is
+       the default behavior of git-merge.
+

 -s <strategy>, \--strategy=<strategy>::
        Use the given merge strategy; can be supplied more than
        once to specify them in the order they should be tried.
        If there is no `-s` option, a built-in list of strategies
        is used instead (`git-merge-recursive` when merging a single
        head, `git-merge-octopus` otherwise).
 -s <strategy>, \--strategy=<strategy>::
        Use the given merge strategy; can be supplied more than
        once to specify them in the order they should be tried.
        If there is no `-s` option, a built-in list of strategies
        is used instead (`git-merge-recursive` when merging a single
        head, `git-merge-octopus` otherwise).

-