Sascha Silbe <sascha-ml-reply-to-2016-2@xxxxxxxxx> writes: > A combination of --break-rewrites and --inter-hunk-context that merges > changes with less than the given number of unchanged lines between them > into a single delete/insert change would be even better. But just > ignoring the unchanged header and footer of a file for --break-rewrites > would already go a long way. That's interesting. Break-rewrites as originally designed and implemented is only about "When the entire file been rewritten completely, it is easier to read when the diff did not pay any attention to those accidentally common lines". We recently had a discussion on tweaking the logic used to merge and minimize hunks; the topic was about where to start the hunk boundary for maximum readability when the beginning and end of a hunk can be shifted around, but this smells like a similar issue. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html