Merge branch 'jk/pretty-G-format-fixes'

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index b8139610b9b22b49fa9427c57154408451b2d333..deb8cca9173ccbaf8c15ade3f8b3312fb6bdcbad 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -237,7 +237,7 @@ list.
        reflog entries from the most recent one to older ones.
        When this option is used you cannot specify commits to
        exclude (that is, '{caret}commit', 'commit1..commit2',
-       nor 'commit1\...commit2' notations cannot be used).
+       and 'commit1\...commit2' notations cannot be used).
 +
 With `--pretty` format other than `oneline` (for obvious reasons),
 this causes the output to have two extra lines of information