Worst one was git rebase vs merge with me defending merge against rebasing everything into a single commit before review... making my existence on this planet miserable.

Well rebasing everything into a single commit does not make much sense. But rebasing or fast forward merges make sense if you have a handfull of commits. As always there are still pros and cons, but merging one or two commits is also kinda stupid.

I personally prefer a mix of merging and rebasing/ff based on context.