From: Junio C Hamano Date: Thu, 14 Feb 2019 22:28:20 +0000 (-0800) Subject: Merge branch 'en/rebase-merge-on-sequencer' X-Git-Tag: v2.21.0-rc2~8 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6f07c7b91197aa06c5d8a05c67100c369012f933?hp=-c Merge branch 'en/rebase-merge-on-sequencer' "git rebase --merge" as been reimplemented by reusing the internal machinery used for "git rebase -i". * en/rebase-merge-on-sequencer: git-rebase.txt: update to reflect merge now implemented on sequencer --- 6f07c7b91197aa06c5d8a05c67100c369012f933 diff --combined Documentation/git-rebase.txt index daa16403ec,29307b1340..619303adbc --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@@ -501,11 -501,6 +501,11 @@@ See also INCOMPATIBLE OPTIONS below with care: the final stash application after a successful rebase might result in non-trivial conflicts. +--reschedule-failed-exec:: +--no-reschedule-failed-exec:: + Automatically reschedule `exec` commands that failed. This only makes + sense in interactive mode (or when an `--exec` option was provided). + INCOMPATIBLE OPTIONS -------------------- @@@ -554,8 -549,6 +554,6 @@@ commit started empty (had no changes re start with) or ended empty (all changes were already applied upstream in other commits). - The merge backend does the same. - The interactive backend drops commits by default that started empty and halts if it hits a commit that ended up empty. The `--keep-empty` option exists for the interactive backend to allow @@@ -564,9 -557,8 +562,9 @@@ it to keep commits that started empty Directory rename detection ~~~~~~~~~~~~~~~~~~~~~~~~~~ -The merge and interactive backends work fine with -directory rename detection. The am backend sometimes does not. +Directory rename heuristics are enabled in the merge and interactive +backends. Due to the lack of accurate tree information, directory +rename detection is disabled in the am backend. include::merge-strategies.txt[] @@@ -974,7 -966,7 +972,7 @@@ when the merge operation did not even s At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, -strategy, with no way to choose a different one. To work around +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).