diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:18:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:18:10 +0900 |
| commit | 53083f8547cd45cdfabcf2f1bd21461cd6769189 (patch) | |
| tree | b55468902cea598ecdab645f4128e40ed3ec0f2b /builtin/diff-index.c | |
| parent | Merge branch 'jh/close-index-before-stat' (diff) | |
| parent | add--interactive: drop diff.indentHeuristic handling (diff) | |
| download | git-53083f8547cd45cdfabcf2f1bd21461cd6769189.tar.gz git-53083f8547cd45cdfabcf2f1bd21461cd6769189.zip | |
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-index.c')
| -rw-r--r-- | builtin/diff-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/diff-index.c b/builtin/diff-index.c index 1af373d002..f084826a29 100644 --- a/builtin/diff-index.c +++ b/builtin/diff-index.c @@ -17,9 +17,9 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) int i; int result; + git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ init_revisions(&rev, prefix); gitmodules_config(); - git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ rev.abbrev = 0; precompose_argv(argc, argv); |