Fix whitespaces when applying and enable rerere

Change a few git configurations.