| commit | 15b07cba0b60f0fc5dea0be0d68a355a8161476d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 Jan 2019 20:47:53 +0000 (29 12:47 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 Jan 2019 20:47:53 +0000 (29 12:47 -0800) | ||
| tree | 1b007627a61f37546097b66d1681ade4ecb92736 | treesnapshot (tar.gz zip) |
| parent | 27dc9eb7f9646ae43ddfa7c9c55f64016b9c2182 | commitdiff |
| parent | 0cd51e9d05e65608126c30fbb65a0cdd197cd570 | commitdiff |
Merge branch 'pw/diff-color-moved-ws-fix'
"git diff --color-moved-ws" updates.
* pw/diff-color-moved-ws-fix:
diff --color-moved-ws: handle blank lines
diff --color-moved-ws: modify allow-indentation-change
diff --color-moved-ws: optimize allow-indentation-change
diff --color-moved=zebra: be stricter with color alternation
diff --color-moved-ws: fix false positives
diff --color-moved-ws: demonstrate false positives
diff: allow --no-color-moved-ws
Use "whitespace" consistently
diff: document --no-color-moved
"git diff --color-moved-ws" updates.
* pw/diff-color-moved-ws-fix:
diff --color-moved-ws: handle blank lines
diff --color-moved-ws: modify allow-indentation-change
diff --color-moved-ws: optimize allow-indentation-change
diff --color-moved=zebra: be stricter with color alternation
diff --color-moved-ws: fix false positives
diff --color-moved-ws: demonstrate false positives
diff: allow --no-color-moved-ws
Use "whitespace" consistently
diff: document --no-color-moved
| Documentation/diff-options.txt | diff1 | diff2 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |
| t/t4015-diff-whitespace.sh | diff1 | diff2 | blobhistory |