On Tue, Sep 07 2021, Johannes Schindelin via GitGitGadget wrote: > In 427c3bd28ab (rebase: deprecate --preserve-merges, 2019-03-11) (which was > included in v2.22.0), we officially deprecated the --preserve-merges > backend. Over two years later, it is time to drop that backend, and here is > a patch series that does just that. > > Changes since v2: > > * Removed the no-longer-needed script_snippet variable > * Enhanced the commit message of the git svn patch to clarify that the > deprecation happened only in v2.25 there > * Adjusted code comments that still talked about the removed option > * Removed some no-longer-needed ACTION_* enum values > * We now also drop check_todo_list_from_file() because it is no longer > needed > * The todo_list_add_exec_commands() function is now scoped to the file > (because there are no longer any outside users) > * When users still use the options, they are no longer met by Git's blank > stares, but by a helpful error message suggesting to use --rebase-merges > instead > > Changes since v1: > > * Rebased onto v2.33.0 > > Johannes Schindelin (11): > t5520: do not use `pull.rebase=preserve` > remote: warn about unhandled branch.<name>.rebase values > tests: stop testing `git rebase --preserve-merges` > pull: remove support for `--rebase=preserve` > rebase: drop support for `--preserve-merges` > git-svn: drop support for `--preserve-merges` > rebase: drop the internal `rebase--interactive` command > rebase: remove obsolete code comment > rebase: stop mentioning the -p option in comments > rebase: remove a no-longer-used function > sequencer: restrict scope of a formerly public function I've looked this version over & followed all the discussions on the earlier rounds (this year), this looks good to me. Thanks a lot for working on it: Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
