Git with smarter diffs