Merge branch 'gr/rebase-i-drop-warn'

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 359587c505a1845c52c28318a80ba298a4eee97e..4f009d44240e3725e25bc8a9a3acd999d69cc487 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -58,9 +58,11 @@ endif::git-rev-list[]
        more than one `--grep=<pattern>`, commits whose message
        matches any of the given patterns are chosen (but see
        `--all-match`).
+ifndef::git-rev-list[]
 +
 When `--show-notes` is in effect, the message from the notes is
 matched as if it were part of the log message.
+endif::git-rev-list[]
 
 --all-match::
        Limit the commits output to ones that match all given `--grep`,