summaryrefslogtreecommitdiffstats
path: root/git-bisect.txt
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.txt
parent98c882d1c4c1d32487bb11a3ba40f66f34b764e4 (diff)
downloadgit-htmldocs-255163d69c70539d1da70a4c63ea5338d8018484.tar.gz
Autogenerated HTML docs for v2.28.0-258-g2befe9
Diffstat (limited to 'git-bisect.txt')
-rw-r--r--git-bisect.txt13
1 files changed, 12 insertions, 1 deletions
diff --git a/git-bisect.txt b/git-bisect.txt
index 7586c5a84..0e993e458 100644
--- a/git-bisect.txt
+++ b/git-bisect.txt
@@ -17,7 +17,7 @@ The command takes various subcommands, and different options depending
on the subcommand:
git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]
- [--no-checkout] [<bad> [<good>...]] [--] [<paths>...]
+ [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]
git bisect (bad|new|<term-new>) [<rev>]
git bisect (good|old|<term-old>) [<rev>...]
git bisect terms [--term-good | --term-bad]
@@ -365,6 +365,17 @@ does not require a checked out tree.
+
If the repository is bare, `--no-checkout` is assumed.
+--first-parent::
++
+Follow only the first parent commit upon seeing a merge commit.
++
+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.
++
+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.
+
EXAMPLES
--------