Hi Junio, On Wed, 1 Sep 2021, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx> > writes: > > > 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. > > A good goal. There is no remaining use case where (a fictitious and > properly working version of) "--preserve-merges" option cannot be > replaced by "--rebase-merges", is it? I somehow had a feeling that > the other Johannes (sorry if it weren't you, j6t) had cases that the > former worked better, but perhaps I am mis-remembering things. I think that I managed to address whatever concerns there were about the `--rebase-merges` backend in the meantime. To be honest, I developed one (minor) concern in the meantime... Should we maybe try to be nicer to our users and keep handling the `--preserve-merges` option by explicitly erroring out with the suggestion to use `--rebase-merges` instead? Not everybody reads release notes, after all. In fact, it is my experience that preciously few users have the time to even skim release notes... Ciao, Dscho
