diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-03-09 17:36:47 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-11 14:52:33 -0700 |
| commit | caafecfcf13e58b474c33db093c9deacd11ceb08 (patch) | |
| tree | f2dff2baa19a7985f742563a393376a18db41514 /Documentation/git-rebase.txt | |
| parent | 2b6ad0f4bca508a04e2b6e940e37f7d98c1a8696 (diff) | |
| download | git-caafecfcf13e58b474c33db093c9deacd11ceb08.tar.gz git-caafecfcf13e58b474c33db093c9deacd11ceb08.tar.xz | |
rebase --rebase-merges: adjust man page for octopus support
Now that we support octopus merges in the `--rebase-merges` mode,
we should give users who actually read the manuals a chance to know
about this fact.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 0e20a66e7..c4bcd24bb 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -879,8 +879,8 @@ rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo). -The `merge` command will merge the specified revision into whatever is -HEAD at that time. With `-C <original-commit>`, the commit message of +The `merge` command will merge the specified revision(s) into whatever +is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message. @@ -889,7 +889,8 @@ If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately. At this time, the `merge` command will *always* use the `recursive` -merge strategy, with no way to choose a different one. To work around +merge strategy for regular merges, and `octopus` for octopus merges, +strategy, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example). |