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.txt | |
parent | 1ff0338e53a8f0c62e5a9370e770e20058c5ad1e (diff) | |
download | git-htmldocs-f09b7cd0fc08d1df0fbd5c756672772049836b7a.tar.gz |
Autogenerated HTML docs for v2.18.0-547-g1d893
Diffstat (limited to 'git-rebase.txt')
-rw-r--r-- | git-rebase.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index a7850415b..1fbc6ebcd 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -960,8 +960,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. @@ -970,7 +970,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). |