X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-options.txt;h=637b53f898829af98153d60953434fa30e3df179;hb=1973b0d790155b5d8a32a6f7401116fad2205721;hp=ffbc6e9861094f48fd3f24af3a0b343c9c0ea7f4;hpb=1947bdbc31e8e1419bdfe90d2357c68919189c30;p=git.git

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index ffbc6e986..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::
@@ -56,5 +64,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).