Git config for better merge commits