Merge branch 'maint'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index ffbc6e9861094f48fd3f24af3a0b343c9c0ea7f4..adadf8e4bf309a2fd2ec8efbeff09b410ca7b041 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,10 +1,18 @@
+-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.stat.
 
 -n::
 --no-stat::
-       Do not show diffstat at the end of the merge.
+       Do not show a diffstat at the end of the merge.
 
 --summary::
 --no-summary::
@@ -31,7 +39,8 @@
 
 --squash::
        Produce the working tree and index state as if a real
-       merge happened, but do not actually make a commit or
+       merge happened (except for the merge information),
+       but do not actually make a commit or
        move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
        cause the next `git commit` command to create a merge
        commit.  This allows you to create a single commit on
@@ -56,5 +65,5 @@
        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).