index 26f3b7b2b0daad0affb36e6514156520a693b164..db1b71d24846e4561d99bed095345eb9580b0632 100644 (file)
is used instead ('git-merge-recursive' when merging a single
head, 'git-merge-octopus' otherwise). This implies --merge.
+-q::
+--quiet::
+ Be quiet. Implies --no-stat.
+
-v::
--verbose::
Be verbose. Implies --stat.