diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-02 22:30:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 22:30:40 (GMT) |
| commit | a81575aa91a015535374bb5b1e0e6dc2a81c74ab (patch) | |
| tree | b7bd20fdd2a3fa1401142017291591cb60cbd148 /advice.c | |
| parent | 7a135475d327f4f4f7f1b4892f69ba7b6ee88e27 (diff) | |
| parent | 626c0b5d395196ddabcf9b9a430db385722689d4 (diff) | |
| download | git-a81575aa91a015535374bb5b1e0e6dc2a81c74ab.zip git-a81575aa91a015535374bb5b1e0e6dc2a81c74ab.tar.gz git-a81575aa91a015535374bb5b1e0e6dc2a81c74ab.tar.bz2 | |
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
Diffstat (limited to 'advice.c')
0 files changed, 0 insertions, 0 deletions