Merge "Print git-diff when pre-commit fails"