verify_lock(): return 0/-1 rather than struct ref_lock *

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index e2de7891cb37cb38605dab2e0b904d38701c37f5..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`,
@@ -680,6 +680,7 @@ endif::git-rev-list[]
        given on the command line. Otherwise (if `sorted` or no argument
        was given), the commits are shown in reverse chronological order
        by commit time.
+       Cannot be combined with `--graph`.
 
 --do-walk::
        Overrides a previous `--no-walk`.
@@ -782,6 +783,7 @@ you would get an output like this:
        on the left hand side of the output.  This may cause extra lines
        to be printed in between commits, in order for the graph history
        to be drawn properly.
+       Cannot be combined with `--no-walk`.
 +
 This enables parent rewriting, see 'History Simplification' below.
 +