git aliases: changed my mind on --no-ff