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>
Johannes Schindelin committed
Mar 9, 2018 at 17:36 UTC
caafecfcf13e58b474c33db093c9deacd11ceb08
1 file changed
+4
-3
Documentation/git-rebase.txt
+4
-3
@@ -879,8 +879,8 @@ rescheduled immediately, with a helpful message how to edit the todo list
879
(this typically happens when a `reset` command was inserted into the todo
880
list manually and contains a typo).
881
882
-The `merge` command will merge the specified revision into whatever is
883
-HEAD at that time. With `-C <original-commit>`, the commit message of
882
+The `merge` command will merge the specified revision(s) into whatever
883
+is HEAD at that time. With `-C <original-commit>`, the commit message of
884
the specified merge commit will be used. When the `-C` is changed to
885
a lower-case `-c`, the message will be opened in an editor after a
886
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.
889
when the merge operation did not even start), it is rescheduled immediately.
890
891
At this time, the `merge` command will *always* use the `recursive`
892
-merge strategy, with no way to choose a different one. To work around
892
+merge strategy for regular merges, and `octopus` for octopus merges,
893
+strategy, with no way to choose a different one. To work around
894
this, an `exec` command can be used to call `git merge` explicitly,
895
using the fact that the labels are worktree-local refs (the ref
896
`refs/rewritten/onto` would correspond to the label `onto`, for example).