Merge branch 'jn/notes-doc'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 81ac82396406c3398f9d2ca67e8f32eef21b9ca7..722d704ff2de1abd3d77a18ca396ba96d5cab6bc 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -72,6 +72,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.
@@ -79,3 +80,4 @@ option can be used to override --squash.
 -v::
 --verbose::
        Be verbose.
+endif::git-pull[]