diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-12-09 13:59:41 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-09 13:59:41 +0900 |
| commit | 2e1a9d9baa0719a5a67da9c049bffc04c23272bd (patch) | |
| tree | a3b6a85554c23eedef6dd69a86332bc2033415c7 /git-rebase.html | |
| parent | f2b280bfddf499d26c09ad311b501d9b699dbf94 (diff) | |
| download | git-htmldocs-2e1a9d9baa0719a5a67da9c049bffc04c23272bd.tar.gz | |
Autogenerated HTML docs for v2.20.0
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 51 |
1 files changed, 17 insertions, 34 deletions
diff --git a/git-rebase.html b/git-rebase.html index 7da35634c..31d6e0774 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1667,41 +1667,24 @@ one based on <a href="git-cherry-pick.html">git-cherry-pick(1)</a> (interactive <div class="sect1">
<h2 id="_behavioral_differences">BEHAVIORAL DIFFERENCES</h2>
<div class="sectionbody">
-<div class="ulist"><ul>
-<li>
-<p>
-empty commits:
-</p>
-<div class="literalblock">
-<div class="content">
-<pre><code>am-based rebase will drop any "empty" commits, whether the
+<div class="paragraph"><p>There are some subtle differences how the backends behave.</p></div>
+<div class="sect2">
+<h3 id="_empty_commits">Empty commits</h3>
+<div class="paragraph"><p>The am backend drops any "empty" commits, regardless of whether the
commit started empty (had no changes relative to its parent to
start with) or ended empty (all changes were already applied
-upstream in other commits).</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>merge-based rebase does the same.</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>interactive-based rebase will by default drop commits that
-started empty and halt if it hits a commit that ended up empty.
-The `--keep-empty` option exists for interactive rebases to allow
-it to keep commits that started empty.</code></pre>
-</div></div>
-</li>
-<li>
-<p>
-directory rename detection:
-</p>
-<div class="literalblock">
-<div class="content">
-<pre><code>merge-based and interactive-based rebases work fine with
-directory rename detection. am-based rebases sometimes do not.</code></pre>
-</div></div>
-</li>
-</ul></div>
+upstream in other commits).</p></div>
+<div class="paragraph"><p>The merge backend does the same.</p></div>
+<div class="paragraph"><p>The interactive backend drops commits by default that
+started empty and halts if it hits a commit that ended up empty.
+The <code>--keep-empty</code> option exists for the interactive backend to allow
+it to keep commits that started empty.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_directory_rename_detection">Directory rename detection</h3>
+<div class="paragraph"><p>The merge and interactive backends work fine with
+directory rename detection. The am backend sometimes does not.</p></div>
+</div>
</div>
</div>
<div class="sect1">
@@ -2475,7 +2458,7 @@ reorder commits tend to produce counterintuitive results. Use <div id="footer">
<div id="footer-text">
Last updated
- 2018-11-13 23:05:48 JST
+ 2018-12-09 13:56:31 JST
</div>
</div>
</body>
|