summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-27 03:13:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-27 03:13:17 (GMT)
commitbf0c5bbe2566d756d7468331161461ea9fec3b1f (patch)
tree3179922b7a98d866fcf86406ac62c5825cb37f63 /Documentation
parent8194fcaa1f0999064a170ed24d36be5432815dce (diff)
parent482ce70e14fdd5d03304a92f1740e6a9022e7958 (diff)
downloadgit-bf0c5bbe2566d756d7468331161461ea9fec3b1f.zip
git-bf0c5bbe2566d756d7468331161461ea9fec3b1f.tar.gz
git-bf0c5bbe2566d756d7468331161461ea9fec3b1f.tar.bz2
Merge branch 'mg/rev-list-n-parents'
* mg/rev-list-n-parents: tests: avoid nonportable {foo,bar} glob rev-list --min-parents,--max-parents: doc, test and completion revision.c: introduce --min-parents and --max-parents options t6009: use test_commit() from test-lib.sh
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rev-list.txt4
-rw-r--r--Documentation/rev-list-options.txt19
2 files changed, 21 insertions, 2 deletions
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index b08dfbc..415f4f0 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -16,6 +16,10 @@ SYNOPSIS
[ \--sparse ]
[ \--merges ]
[ \--no-merges ]
+ [ \--min-parents=<number> ]
+ [ \--no-min-parents ]
+ [ \--max-parents=<number> ]
+ [ \--no-max-parents ]
[ \--first-parent ]
[ \--remove-empty ]
[ \--full-history ]
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 5c6850f..ea5c6c4 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -72,11 +72,26 @@ endif::git-rev-list[]
--merges::
- Print only merge commits.
+ Print only merge commits. This is exactly the same as `--min-parents=2`.
--no-merges::
- Do not print commits with more than one parent.
+ Do not print commits with more than one parent. This is
+ exactly the same as `--max-parents=1`.
+
+--min-parents=<number>::
+--max-parents=<number>::
+--no-min-parents::
+--no-max-parents::
+
+ Show only commits which have at least (or at most) that many
+ 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.
++
+`--no-min-parents` and `--no-max-parents` reset these limits (to no limit)
+again. Equivalent forms are `--min-parents=0` (any commit has 0 or more
+parents) and `--max-parents=-1` (negative numbers denote no upper limit).
--first-parent::
Follow only the first parent commit upon seeing a merge