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 /git-rev-list.html | |
| parent | 6371b0eccc1e7310e20b934ae4e78fa5d363a4c7 (diff) | |
| download | git-htmldocs-f32ce262468f57fc5993424c6a48b8aafd97b3f3.tar.gz | |
Autogenerated HTML docs for v1.7.4.2-406-gbe91
Diffstat (limited to 'git-rev-list.html')
| -rw-r--r-- | git-rev-list.html | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/git-rev-list.html b/git-rev-list.html index 521aadf2d..7c97ba95b 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -422,6 +422,10 @@ git-rev-list(1) Manual Page [ --sparse ]
[ --merges ]
[ --no-merges ]
+ [ --min-parents=<number> ]
+ [ --no-min-parents ]
+ [ --max-parents=<number> ]
+ [ --no-max-parents ]
[ --first-parent ]
[ --remove-empty ]
[ --full-history ]
@@ -639,7 +643,7 @@ ordering and formatting options, such as <em>--reverse</em>.</p></div> </dt>
<dd>
<p>
- Print only merge commits.
+ Print only merge commits. This is exactly the same as <tt>--min-parents=2</tt>.
</p>
</dd>
<dt class="hdlist1">
@@ -647,10 +651,34 @@ ordering and formatting options, such as <em>--reverse</em>.</p></div> </dt>
<dd>
<p>
- Do not print commits with more than one parent.
+ Do not print commits with more than one parent. This is
+ exactly the same as <tt>--max-parents=1</tt>.
</p>
</dd>
<dt class="hdlist1">
+--min-parents=<number>
+</dt>
+<dt class="hdlist1">
+--max-parents=<number>
+</dt>
+<dt class="hdlist1">
+--no-min-parents
+</dt>
+<dt class="hdlist1">
+--no-max-parents
+</dt>
+<dd>
+<p>
+ Show only commits which have at least (or at most) that many
+ commits. In particular, <tt>--max-parents=1</tt> is the same as <tt>--no-merges</tt>,
+ <tt>--min-parents=2</tt> is the same as <tt>--merges</tt>. <tt>--max-parents=0</tt>
+ gives all root commits and <tt>--min-parents=3</tt> all octopus merges.
+</p>
+<div class="paragraph"><p><tt>--no-min-parents</tt> and <tt>--no-max-parents</tt> reset these limits (to no limit)
+again. Equivalent forms are <tt>--min-parents=0</tt> (any commit has 0 or more
+parents) and <tt>--max-parents=-1</tt> (negative numbers denote no upper limit).</p></div>
+</dd>
+<dt class="hdlist1">
--first-parent
</dt>
<dd>
@@ -1987,7 +2015,7 @@ $ git log -2 --pretty=%h 4da45bef</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-23 05:39:52 UTC
+Last updated 2011-03-27 07:10:12 UTC
</div>
</div>
</body>
|