diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 23:20:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 23:20:47 -0800 |
| commit | 23168ef89678fc52e01173bbc7fdaa760f21d02a (patch) | |
| tree | 8425bac71f938dfce77a3c2928b2c936b03789c9 /git-rebase.html | |
| parent | 2567b326fac6961a6fc6075ad2f22a744252f2f3 (diff) | |
| download | git-htmldocs-23168ef89678fc52e01173bbc7fdaa760f21d02a.tar.gz | |
Autogenerated HTML docs for v2.21.0-rc0
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/git-rebase.html b/git-rebase.html index d32eeb537..ec81883bd 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1548,27 +1548,7 @@ used to override and disable this setting.</p></div> <div class="sect1">
<h2 id="_incompatible_options">INCOMPATIBLE OPTIONS</h2>
<div class="sectionbody">
-<div class="paragraph"><p>git-rebase has many flags that are incompatible with each other,
-predominantly due to the fact that it has three different underlying
-implementations:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-one based on <a href="git-am.html">git-am(1)</a> (the default)
-</p>
-</li>
-<li>
-<p>
-one based on git-merge-recursive (merge backend)
-</p>
-</li>
-<li>
-<p>
-one based on <a href="git-cherry-pick.html">git-cherry-pick(1)</a> (interactive backend)
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Flags only understood by the am backend:</p></div>
+<div class="paragraph"><p>The following options:</p></div>
<div class="ulist"><ul>
<li>
<p>
@@ -1596,7 +1576,7 @@ one based on <a href="git-cherry-pick.html">git-cherry-pick(1)</a> (interactive </p>
</li>
</ul></div>
-<div class="paragraph"><p>Flags understood by both merge and interactive backends:</p></div>
+<div class="paragraph"><p>are incompatible with the following options:</p></div>
<div class="ulist"><ul>
<li>
<p>
@@ -1618,9 +1598,6 @@ one based on <a href="git-cherry-pick.html">git-cherry-pick(1)</a> (interactive --allow-empty-message
</p>
</li>
-</ul></div>
-<div class="paragraph"><p>Flags only understood by the interactive backend:</p></div>
-<div class="ulist"><ul>
<li>
<p>
--[no-]autosquash
@@ -1667,7 +1644,7 @@ one based on <a href="git-cherry-pick.html">git-cherry-pick(1)</a> (interactive </p>
</li>
</ul></div>
-<div class="paragraph"><p>Other incompatible flag pairs:</p></div>
+<div class="paragraph"><p>In addition, the following pairs of options are incompatible:</p></div>
<div class="ulist"><ul>
<li>
<p>
@@ -2492,7 +2469,7 @@ reorder commits tend to produce counterintuitive results. Use <div id="footer">
<div id="footer-text">
Last updated
- 2019-01-29 13:16:51 PST
+ 2019-02-06 23:17:45 PST
</div>
</div>
</body>
|