add git alias 'fmerge' for feature merge (no ff)