Merge branch 'maint'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 5064bf83fa20c12cc699e5432e6dd6d29eda22de..3b83dba1a0d8ad1436d15d164783f08593f54357 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -74,3 +74,8 @@ option can be used to override --squash.
 -v::
 --verbose::
        Be verbose.
+
+-X <option>::
+--strategy-option=<option>::
+       Pass merge strategy specific option through to the merge
+       strategy.