Remove duplication of [diff] from .gitconfig
Remove unused assume/unassume trickery from .gitconfig