Git merge aliases

Use ```gmnff``` and ```gmff``` aliases for ```not fast forward (--no-ff)```  and ```only fast forward (-ff)```

I think this make merging a litte superiorly