diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-19 15:26:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-19 15:26:45 -0800 |
| commit | d3be992a031c05fe1064c94e11d7c53a32fd8c82 (patch) | |
| tree | 3d2f10a8cad60cc72ed9217b33596d2141d156f8 /git-rebase.html | |
| parent | 2f80fe95f22fdd82c0f720180001baab74199534 (diff) | |
| download | git-htmldocs-d3be992a031c05fe1064c94e11d7c53a32fd8c82.tar.gz | |
Autogenerated HTML docs for v2.21.0-rc2
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/git-rebase.html b/git-rebase.html index 3cfe5417c..c5c13df37 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1619,11 +1619,6 @@ used to override and disable this setting.</p></div> </li>
<li>
<p>
---autosquash
-</p>
-</li>
-<li>
-<p>
--edit-todo
</p>
</li>
@@ -1673,7 +1668,6 @@ used to override and disable this setting.</p></div> 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).</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
@@ -2458,7 +2452,7 @@ reorder commits tend to produce counterintuitive results. Use <div id="footer">
<div id="footer-text">
Last updated
- 2019-02-08 21:04:48 PST
+ 2019-02-19 15:22:22 PST
</div>
</div>
</body>
|