remove word-diff from gitconfig
enable rerere mode in gitconfig