| commit | 53083f8547cd45cdfabcf2f1bd21461cd6769189 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Jun 2017 00:18:10 +0000 (5 09:18 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Jun 2017 00:18:10 +0000 (5 09:18 +0900) | ||
| tree | b55468902cea598ecdab645f4128e40ed3ec0f2b | treesnapshot (tar.gz zip) |
| parent | 70f8ba55242ca7ebf46b43d8b29d09c552acce1f | commitdiff |
| parent | 1fa8a66bf76953c6fb9cfe5e17b26a3a0920f538 | commitdiff |
Merge branch 'mb/diff-default-to-indent-heuristics'
Make the "indent" heuristics the default in "diff" and diff.indentHeuristics
configuration variable an escape hatch for those who do no want it.
* mb/diff-default-to-indent-heuristics:
add--interactive: drop diff.indentHeuristic handling
diff: enable indent heuristic by default
diff: have the diff-* builtins configure diff before initializing revisions
diff: make the indent heuristic part of diff's basic configuration
Make the "indent" heuristics the default in "diff" and diff.indentHeuristics
configuration variable an escape hatch for those who do no want it.
* mb/diff-default-to-indent-heuristics:
add--interactive: drop diff.indentHeuristic handling
diff: enable indent heuristic by default
diff: have the diff-* builtins configure diff before initializing revisions
diff: make the indent heuristic part of diff's basic configuration
| builtin/diff-tree.c | diff1 | diff2 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |