From: Junio C Hamano Date: Thu, 2 Aug 2018 22:30:40 +0000 (-0700) Subject: Merge branch 'sb/diff-color-move-more' X-Git-Tag: v2.19.0-rc0~108 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a81575aa91a015535374bb5b1e0e6dc2a81c74ab Merge branch 'sb/diff-color-move-more' "git diff --color-moved" feature has further been tweaked. * sb/diff-color-move-more: diff.c: offer config option to control ws handling in move detection diff.c: add white space mode to move detection that allows indent changes diff.c: factor advance_or_nullify out of mark_color_as_moved diff.c: decouple white space treatment from move detection algorithm diff.c: add a blocks mode for moved code detection diff.c: adjust hash function signature to match hashmap expectation diff.c: do not pass diff options as keydata to hashmap t4015: avoid git as a pipe input xdiff/xdiffi.c: remove unneeded function declarations xdiff/xdiff.h: remove unused flags --- a81575aa91a015535374bb5b1e0e6dc2a81c74ab