.gitconfig: remove merge.ff = only

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>