`git merge --ff-only` isn't quite the same semantics as sync though - sync *will* do a recursive merge if it has to. I'm on the fence on this one, I could pick either one