Merge git://ozlabs.org/~paulus/gitk

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index a9b808fab321e8287806c0bca34f1e41af3d41d1..f1c52208f08c3dc9f50e8d18f546a96276a47fec 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`,