On Fri, Feb 17, 2023 at 4:15 AM Tao Klerks <tao@xxxxxxxxxx> wrote: > > On Fri, Feb 17, 2023 at 4:15 AM Alex Henrie <alexhenrie24@xxxxxxxxx> wrote: > > > > I would be OK with the proposed patch if it were part > > of a larger effort to make --rebase-merges the default behavior of > > `git rebase`. > > Heh, what would it take to convince you there is such an effort? :) Doing steps 1-3 :) > > 4. Change the `git pull` advice to recommend --rebase=merges and > > pull.rebase=merges. > > I'm not sure why this would be step 4 - I would (and did try to) make > it step 1 :) The unintuitive syntax --rebase=merges makes a little more sense if there is a warning in `git rebase` about it being a temporary necessity to support a planned behavior change, and we're explicitly committing to not expect users to use that syntax forever. It might be a good idea to add a similar note to the `git pull` warning too. -Alex
