diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 03:18:10 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 03:18:10 +0300 |
| commit | 53083f8547cd45cdfabcf2f1bd21461cd6769189 (patch) | |
| tree | b55468902cea598ecdab645f4128e40ed3ec0f2b /builtin/diff-tree.c | |
| parent | 70f8ba55242ca7ebf46b43d8b29d09c552acce1f (diff) | |
| parent | 1fa8a66bf76953c6fb9cfe5e17b26a3a0920f538 (diff) | |
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
Diffstat (limited to 'builtin/diff-tree.c')
| -rw-r--r-- | builtin/diff-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index 5ea1c14317..e401112045 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -105,9 +105,9 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) struct setup_revision_opt s_r_opt; int read_stdin = 0; + git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ init_revisions(opt, prefix); gitmodules_config(); - git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ opt->abbrev = 0; opt->diff = 1; opt->disable_stdin = 1; |