On Fri, Feb 28, 2020 at 2:54 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > * en/merge-path-collision (2020-02-27) 1 commit > - merge-recursive: apply collision handling unification to recursive case > > Handling of conflicting renames in merge-recursive have further > been made consistent with how existing codepaths try to mimick what > is done to add/add conflicts. s/mimick/mimic/? > * en/rebase-backend (2020-02-16) 20 commits > (merged to 'next' on 2020-02-22 at cae5eb0f18) > + rebase: rename the two primary rebase backends > + rebase: change the default backend from "am" to "merge" > + rebase: make the backend configurable via config setting > + rebase tests: repeat some tests using the merge backend instead of am > + rebase tests: mark tests specific to the am-backend with --am > + rebase: drop '-i' from the reflog for interactive-based rebases > + git-prompt: change the prompt for interactive-based rebases > + rebase: add an --am option > + rebase: move incompatibility checks between backend options a bit earlier > + git-rebase.txt: add more details about behavioral differences of backends > + rebase: allow more types of rebases to fast-forward > + t3432: make these tests work with either am or merge backends > + rebase: fix handling of restrict_revision > + rebase: make sure to pass along the quiet flag to the sequencer > + rebase, sequencer: remove the broken GIT_QUIET handling > + t3406: simplify an already simple test > + rebase (interactive-backend): fix handling of commits that become empty > + rebase (interactive-backend): make --keep-empty the default > + t3404: directly test the behavior of interest > + git-rebase.txt: update description of --allow-empty-message > > "git rebase" has learned to use the sequencer backend by default, > while allowing "--am" option to go back to the traditional "am" > backend. We may need to reword this description due to the last patch in the series. Also, the description misses the new rebase.backend configuration setting. I'm not the best at wording these release notes, but something along the lines of: "git rebase" has learned to use the merge backend by default, while allowing "--apply" option to go back to the traditional apply backend, or allowing an alternate default to be set via the new rebase.backend configuration variable. This series also renames the backends from "interactive" (or "sequencer") to "merge" and from "am" to "apply".
