Merge branch 'maint'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 007909a82fe77325e46c54799d00dc78493a47f9..427cdefd01b7cffad3d00efe029c012709b3a389 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,3 +1,11 @@
+-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.