This goes on top of sb/diff-color-moved. Each patch is written as if it can go in as a normal patch, but I intend to squash them into the series appropriately if there is more feedback on that series in general. Stefan Beller (6): diff.c: factor out shrinking of potential moved line blocks diff.c: change the default for move coloring to zebra diff.c: better reporting on color.moved bogus configuration Documentation/diff: reword color moved diff.c: omit uninteresting moved lines diff.c: detect blocks despite whitespace changes Documentation/config.txt | 6 ++-- Documentation/diff-options.txt | 10 ++++-- diff.c | 79 ++++++++++++++++++++++++++++-------------- diff.h | 2 ++ t/t4015-diff-whitespace.sh | 65 ++++++++++++++++++++++++++++++++++ 5 files changed, 131 insertions(+), 31 deletions(-) -- 2.13.0.31.g9b732c453e