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

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index f37a77648..637b53f89 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,11 +1,21 @@
+-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.
+-n::
+--no-stat::
+	Do not show a diffstat at the end of the merge.
 
---summary, \--no-summary::
+--summary::
+--no-summary::
 	Synonyms to --stat and --no-stat; these are deprecated and will be
 	removed in the future.
 
@@ -49,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).