git: enble rerere by default
git: Always show a diffstat at the end of a merge