Fix indentation in gitconfig.
Make git use the patient merge algorithm.
Enable rerere so merges hopefully will be easier in the future.