Merge branch 'sg/complete-decorate-full-not-long' into maint

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index f620ee4e1cff3f7d6d4c26f35db8b9011894c89a..77ac439234f40f51aae8613a672de06e3e143771 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -59,8 +59,8 @@ endif::git-rev-list[]
        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.
+When `--show-notes` is in effect, the message from the notes is
+matched as if it were part of the log message.
 
 --all-match::
        Limit the commits output to ones that match all given `--grep`,