Merge branch 'jk/maint-add-ignored-dir'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 3b83dba1a0d8ad1436d15d164783f08593f54357..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,6 +75,7 @@ option can be used to override --squash.
 -v::
 --verbose::
        Be verbose.
+endif::git-pull[]
 
 -X <option>::
 --strategy-option=<option>::