Use patience diff.
Enable git-credential-osxkeychain.
Updates.