add git merge fast-forward alias