diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-09 14:30:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-09 14:30:37 -0700 |
| commit | 096c5cff77f1dde2163fba14ace86e4d27ae4210 (patch) | |
| tree | 79b09a917178f74d45781482b6707d5ad9be6d93 /git-rebase.html | |
| parent | a89117826695bd15a06ab893f088622d58d49b0f (diff) | |
| download | git-htmldocs-096c5cff77f1dde2163fba14ace86e4d27ae4210.tar.gz | |
Autogenerated HTML docs for v2.28.0-rc0
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/git-rebase.html b/git-rebase.html index 67c699239..d7c513993 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1135,14 +1135,17 @@ the merge base to determine the <em>set of commits</em> which will be rebased.</ using --autostash, it will be saved to the stash list.
</p>
</dd>
-</dl></div>
-<div class="paragraph"><p>--apply:
+<dt class="hdlist1">
+--apply
+</dt>
+<dd>
+<p>
Use applying strategies to rebase (calling <code>git-am</code>
internally). This option may become a no-op in the future
- once the merge backend handles everything the apply one does.</p></div>
-<div class="paragraph"><p>+
-See also INCOMPATIBLE OPTIONS below.</p></div>
-<div class="dlist"><dl>
+ once the merge backend handles everything the apply one does.
+</p>
+<div class="paragraph"><p>See also INCOMPATIBLE OPTIONS below.</p></div>
+</dd>
<dt class="hdlist1">
--empty={drop,keep,ask}
</dt>
@@ -2713,7 +2716,7 @@ Use <code>--rebase-merges</code> in such scenarios instead.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-05-08 15:24:24 PDT
+ 2020-07-09 14:26:04 PDT
</div>
</div>
</body>
|