Merge branch 'maint' of git://github.com/git-l10n/git-po into maint

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 27f8de3d8616d831e4a5b6d9ae7ab22e8ad12115..5bdfb4285247770722434541700b0f7547e3a113 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -119,7 +119,7 @@ if it is part of the log message.
 --no-min-parents::
 --no-max-parents::
 
-       Show only commits which have at least (or at most) that many
+       Show only commits which have at least (or at most) that many parent
        commits. In particular, `--max-parents=1` is the same as `--no-merges`,
        `--min-parents=2` is the same as `--merges`.  `--max-parents=0`
        gives all root commits and `--min-parents=3` all octopus merges.