diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-27 07:35:11 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-27 07:35:11 +0000 |
| commit | f32ce262468f57fc5993424c6a48b8aafd97b3f3 (patch) | |
| tree | 7699fa96ab976e5f80fda6bd8577ecca4f0884d3 /rev-list-options.txt | |
| parent | 6371b0eccc1e7310e20b934ae4e78fa5d363a4c7 (diff) | |
| download | git-htmldocs-f32ce262468f57fc5993424c6a48b8aafd97b3f3.tar.gz | |
Autogenerated HTML docs for v1.7.4.2-406-gbe91
Diffstat (limited to 'rev-list-options.txt')
| -rw-r--r-- | rev-list-options.txt | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/rev-list-options.txt b/rev-list-options.txt index 5c6850f04..ea5c6c49b 100644 --- a/rev-list-options.txt +++ b/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 |