update: When doing a git update, require fast-forward, don't rebase