git aliases for fast-forward-only merging