diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-02 16:01:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 16:01:45 -0700 |
| commit | f09b7cd0fc08d1df0fbd5c756672772049836b7a (patch) | |
| tree | f5407aed048f255184084b9127f43dbf337eb27a /git-rebase.html | |
| parent | 1ff0338e53a8f0c62e5a9370e770e20058c5ad1e (diff) | |
| download | git-htmldocs-f09b7cd0fc08d1df0fbd5c756672772049836b7a.tar.gz | |
Autogenerated HTML docs for v2.18.0-547-g1d893
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-rebase.html b/git-rebase.html index f8b93274d..498f1cc06 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -2363,15 +2363,16 @@ refuses to overwrite untracked files. If the <code>reset</code> command fails, i rescheduled immediately, with a helpful message how to edit the todo list
(this typically happens when a <code>reset</code> command was inserted into the todo
list manually and contains a typo).</p></div>
-<div class="paragraph"><p>The <code>merge</code> command will merge the specified revision into whatever is
-HEAD at that time. With <code>-C <original-commit></code>, the commit message of
+<div class="paragraph"><p>The <code>merge</code> command will merge the specified revision(s) into whatever
+is HEAD at that time. With <code>-C <original-commit></code>, the commit message of
the specified merge commit will be used. When the <code>-C</code> is changed to
a lower-case <code>-c</code>, the message will be opened in an editor after a
successful merge so that the user can edit the message.</p></div>
<div class="paragraph"><p>If a <code>merge</code> command fails for any reason other than merge conflicts (i.e.
when the merge operation did not even start), it is rescheduled immediately.</p></div>
<div class="paragraph"><p>At this time, the <code>merge</code> command will <strong>always</strong> use the <code>recursive</code>
-merge strategy, with no way to choose a different one. To work around
+merge strategy for regular merges, and <code>octopus</code> for octopus merges,
+strategy, with no way to choose a different one. To work around
this, an <code>exec</code> command can be used to call <code>git merge</code> explicitly,
using the fact that the labels are worktree-local refs (the ref
<code>refs/rewritten/onto</code> would correspond to the label <code>onto</code>, for example).</p></div>
@@ -2454,7 +2455,7 @@ reorder commits tend to produce counterintuitive results. Use <div id="footer">
<div id="footer-text">
Last updated
- 2018-07-25 15:10:28 PDT
+ 2018-08-02 16:01:08 PDT
</div>
</div>
</body>
|