Add git alias to merge with --no-ff flag