Add git alias for merging with no fast-forward