summaryrefslogtreecommitdiffstats
path: root/rev-list-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-08-05 15:43:36 -0700
committerJunio C Hamano <gitster@pobox.com>2013-08-05 15:43:36 -0700
commitc5bb3b39452f9781acd2d4b20a389f239d4102ed (patch)
tree65bb3b8a2aa4a690a6c30ec5e58b5b307f23a67a /rev-list-options.txt
parent00cc693dd726a1f09a16209505009367a563b077 (diff)
downloadgit-htmldocs-c5bb3b39452f9781acd2d4b20a389f239d4102ed.tar.gz
Autogenerated HTML docs for v1.8.4-rc1-21-gfb565
Diffstat (limited to 'rev-list-options.txt')
-rw-r--r--rev-list-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/rev-list-options.txt b/rev-list-options.txt
index 27f8de3d8..5bdfb4285 100644
--- a/rev-list-options.txt
+++ b/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.