git: kill merge.ff=false

Signed-off-by: Christopher Larson <kergoth@gmail.com>