diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:37:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:37:23 -0700 |
| commit | 255163d69c70539d1da70a4c63ea5338d8018484 (patch) | |
| tree | f1e3319eea5e1b06a30e14911697fd6973231feb /git-rev-list.html | |
| parent | 98c882d1c4c1d32487bb11a3ba40f66f34b764e4 (diff) | |
| download | git-htmldocs-255163d69c70539d1da70a4c63ea5338d8018484.tar.gz | |
Autogenerated HTML docs for v2.28.0-258-g2befe9
Diffstat (limited to 'git-rev-list.html')
| -rw-r--r-- | git-rev-list.html | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/git-rev-list.html b/git-rev-list.html index 9dc87a461..4ccb22160 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1043,8 +1043,7 @@ parents) and <code>--max-parents=-1</code> (negative numbers denote no upper lim because merges into a topic branch tend to be only about
adjusting to updated upstream from time to time, and
this option allows you to ignore the individual commits
- brought in to your history by such a merge. Cannot be
- combined with --bisect.
+ brought in to your history by such a merge.
</p>
</dd>
<dt class="hdlist1">
@@ -1877,7 +1876,7 @@ commits are marked as TREESAME (subject to be simplified away).</p></div> <div class="paragraph"><p>would be of roughly the same length. Finding the change which
introduces a regression is thus reduced to a binary search: repeatedly
generate and test new 'midpoint’s until the commit chain is of length
-one. Cannot be combined with --first-parent.</p></div>
+one.</p></div>
</dd>
<dt class="hdlist1">
--bisect-vars
|