git-merge: warn when -m provided on a fast forward