[git] alias for merge --no-ff