Merge branch 'so/submodule-no-update-first-time'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 81ac82396406c3398f9d2ca67e8f32eef21b9ca7..e33e0f8e110879a0cd6fe81d97ee6044290e5cfa 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -16,11 +16,11 @@ inspect and further tweak the merge result before committing.
 With --no-ff Generate a merge commit even if the merge
 resolved as a fast-forward.
 
---log::
+--log[=<n>]::
 --no-log::
        In addition to branch names, populate the log message with
-       one-line descriptions from the actual commits that are being
-       merged.
+       one-line descriptions from at most <n> actual commits that are being
+       merged. See also linkgit:git-fmt-merge-msg[1].
 +
 With --no-log do not list one-line descriptions from the
 actual commits being merged.
@@ -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[]