index 3b83dba1a0d8ad1436d15d164783f08593f54357..81ac82396406c3398f9d2ca67e8f32eef21b9ca7 100644 (file)
is used instead ('git merge-recursive' when merging a single
head, 'git merge-octopus' otherwise).
+-X <option>::
+--strategy-option=<option>::
+ Pass merge strategy specific option through to the merge
+ strategy.
+
--summary::
--no-summary::
Synonyms to --stat and --no-stat; these are deprecated and will be
-v::
--verbose::
Be verbose.
-
--X <option>::
---strategy-option=<option>::
- Pass merge strategy specific option through to the merge
- strategy.