Annoyingly this always re-writes commits (i.e. never fast-forwards), which means that if you have branches based on the branch you're merging they will need to be rebased, and git will complain about deleting the branch because it looks like it's unmerged.

I know about that but don't know if it works for updating a branch before merging it. I'll have to try changing it to that setting.