Revert "git: Set no fast-forwarding as default"

This reverts commit aba554625080df7be54c8beeddeccb93e6d7ab4f.