summaryrefslogtreecommitdiffstats
path: root/git-bisect.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-08-17 17:37:23 -0700
committerJunio C Hamano <gitster@pobox.com>2020-08-17 17:37:23 -0700
commit255163d69c70539d1da70a4c63ea5338d8018484 (patch)
treef1e3319eea5e1b06a30e14911697fd6973231feb /git-bisect.html
parent98c882d1c4c1d32487bb11a3ba40f66f34b764e4 (diff)
downloadgit-htmldocs-255163d69c70539d1da70a4c63ea5338d8018484.tar.gz
Autogenerated HTML docs for v2.28.0-258-g2befe9
Diffstat (limited to 'git-bisect.html')
-rw-r--r--git-bisect.html15
1 files changed, 13 insertions, 2 deletions
diff --git a/git-bisect.html b/git-bisect.html
index c6834a466..fdfbbacc7 100644
--- a/git-bisect.html
+++ b/git-bisect.html
@@ -762,7 +762,7 @@ on the subcommand:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>git bisect start [--term-{old,good}=&lt;term&gt; --term-{new,bad}=&lt;term&gt;]
- [--no-checkout] [&lt;bad&gt; [&lt;good&gt;...]] [--] [&lt;paths&gt;...]
+ [--no-checkout] [--first-parent] [&lt;bad&gt; [&lt;good&gt;...]] [--] [&lt;paths&gt;...]
git bisect (bad|new|&lt;term-new&gt;) [&lt;rev&gt;]
git bisect (good|old|&lt;term-old&gt;) [&lt;rev&gt;...]
git bisect terms [--term-good | --term-bad]
@@ -1065,6 +1065,17 @@ it point to the commit that should be tested.</p></div>
does not require a checked out tree.</p></div>
<div class="paragraph"><p>If the repository is bare, <code>--no-checkout</code> is assumed.</p></div>
</dd>
+<dt class="hdlist1">
+--first-parent
+</dt>
+<dd>
+<div class="paragraph"><p>Follow only the first parent commit upon seeing a merge commit.</p></div>
+<div class="paragraph"><p>In detecting regressions introduced through the merging of a branch, the merge
+commit will be identified as introduction of the bug and its ancestors will be
+ignored.</p></div>
+<div class="paragraph"><p>This option is particularly useful in avoiding false positives when a merged
+branch contained broken or non-buildable commits, but the merge itself was OK.</p></div>
+</dd>
</dl></div>
</div>
</div>
@@ -1229,7 +1240,7 @@ help</code> or <code>git bisect -h</code> to get a long usage description.</p></
<div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-08-17 17:32:33 PDT
</div>
</div>
</body>