X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-options.txt;h=637b53f898829af98153d60953434fa30e3df179;hb=f92f2038a5192ac5fc1bb4f38c49906aa45b3f1e;hp=007909a82fe77325e46c54799d00dc78493a47f9;hpb=141201d124f3663a98e0f362c1af7f5f7b58dabb;p=git.git

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 007909a82..637b53f89 100644
--- 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::