Merge branch 'js/maint-bisect-gitk'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 9f1fc825503a7c972fe162f4e2a87781e0f783f3..637b53f898829af98153d60953434fa30e3df179 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,9 +1,32 @@
---summary::
+-q::
+--quiet::
+       Operate quietly.
+
+-v::
+--verbose::
+       Be verbose.
+
+--stat::
        Show a diffstat at the end of the merge. The diffstat is also
-       controlled by the configuration option merge.diffstat.
+       controlled by the configuration option merge.stat.
+
+-n::
+--no-stat::
+       Do not show a diffstat at the end of the merge.
+
+--summary::
+--no-summary::
+       Synonyms to --stat and --no-stat; these are deprecated and will be
+       removed in the future.
+
+--log::
+       In addition to branch names, populate the log message with
+       one-line descriptions from the actual commits that are being
+       merged.
 
--n, \--no-summary::
-       Do not show diffstat at the end of the merge.
+--no-log::
+       Do not list one-line descriptions from the actual commits being
+       merged.
 
 --no-commit::
        Perform the merge but pretend the merge failed and do
@@ -36,9 +59,10 @@
        a fast-forward, only update the branch pointer. This is
        the default behavior of git-merge.
 
--s <strategy>, \--strategy=<strategy>::
+-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).
+       is used instead ('git-merge-recursive' when merging a single
+       head, 'git-merge-octopus' otherwise).