[juliusmusseau]

Joking aside, "git pull -r" is pure magic in the face of upstream rewrites. It always does the right thing:

https://mergebase.com/doing-git-wrong/2018/03/07/fun-with-gi...

After I wrote that blog post someone told me the reason for the magic is the use of "git merge-base --fork-point" under the hood.

[yebyen]

`pull --rebase` is nothing, go back and read the history of `rebase --preserve-merges` and now `rebase --rebase-merges`

I have worked with both, and the new one is much better. Of course this only matters if the branch you are rebasing has merges in it (so in all likelihood, you must be a release manager to need features like this)

Between rebase-merges and --onto, I don't spend hardly any time fixing up bad merges anymore.