fast-import: always create marks_file directories

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 5064bf83fa20c12cc699e5432e6dd6d29eda22de..37ce9a17fc3d66c402954246c83d0ec93fe007af 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -67,6 +67,7 @@ option can be used to override --squash.
        Synonyms to --stat and --no-stat; these are deprecated and will be
        removed in the future.
 
+ifndef::git-pull[]
 -q::
 --quiet::
        Operate quietly.
@@ -74,3 +75,9 @@ option can be used to override --squash.
 -v::
 --verbose::
        Be verbose.
+endif::git-pull[]
+
+-X <option>::
+--strategy-option=<option>::
+       Pass merge strategy specific option through to the merge
+       strategy.