Fine-tuning the git diff stuff