aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-02-12 13:16:10 -0800
committerJunio C Hamano <gitster@pobox.com>2024-02-12 13:16:10 -0800
commit13fdf82e09a397f4edad32f847ef3fdf7a276636 (patch)
treed68091c752399b367073df3816e7fefea4a68dc3
parent46761378c3ba8915fd5a52995c8f6c1a847bed84 (diff)
parent841dbd40a350b6bde402ca36a56c815f13f20480 (diff)
downloadgit-13fdf82e09a397f4edad32f847ef3fdf7a276636.tar.gz
Merge branch 'jc/bisect-doc'
Doc update. * jc/bisect-doc: bisect: document command line arguments for "bisect start" bisect: document "terms" subcommand more fully
-rw-r--r--Documentation/git-bisect.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 8e01f1d618..82f944dc03 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -16,11 +16,11 @@ DESCRIPTION
The command takes various subcommands, and different options depending
on the subcommand:
- git bisect start [--term-(new|bad)=<term-new> --term-(old|good)=<term-old>]
+ git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]
[--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]
git bisect (bad|new|<term-new>) [<rev>]
git bisect (good|old|<term-old>) [<rev>...]
- git bisect terms [--term-good | --term-bad]
+ git bisect terms [--term-(good|old) | --term-(bad|new)]
git bisect skip [(<rev>|<range>)...]
git bisect reset [<commit>]
git bisect (visualize|view)
@@ -165,8 +165,10 @@ To get a reminder of the currently used terms, use
git bisect terms
------------------------------------------------
-You can get just the old (respectively new) term with `git bisect terms
---term-old` or `git bisect terms --term-good`.
+You can get just the old term with `git bisect terms --term-old`
+or `git bisect terms --term-good`; `git bisect terms --term-new`
+and `git bisect terms --term-bad` can be used to learn how to call
+the commits more recent than the sought change.
If you would like to use your own terms instead of "bad"/"good" or
"new"/"old", you can choose any names you like (except existing bisect