Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui

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