word-diff and short git-status in .gitconfig