summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorstein Hegge <hegge@resisty.net>2013-08-02 20:40:07 +0200
committerJunio C Hamano <gitster@pobox.com>2013-08-05 08:47:06 -0700
commit5104d21fbdf7c7bda341d4f0ff406fb66dce839d (patch)
tree53a153aa8170592e706f1c6ffe1418e8e9aa17df
parente6604c3537e8b60d6cbc821e7d356924c0a0e809 (diff)
downloadgit-5104d21fbdf7c7bda341d4f0ff406fb66dce839d.tar.gz
Documentation/rev-list-options: add missing word in --*-parents
A commit has "parent commits" or "parents", not "commits". Signed-off-by: Torstein Hegge <hegge@resisty.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/rev-list-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 3bdbf5e856..83ae20c9c6 100644
--- 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.