gitconfig: merge --no-ff alias

Signed-off-by: Adrian-Tudor Panescu <tudor.panescu@cynny.com>