pull --rebase: exit early when the working directory is dirty

diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
index ebc50efbd22f7fa294d66d73d7b2c3084931b4b7..832797ff3bb45751758f0d629abb2cf8fa4507ad 100644 (file)
--- a/builtin-diff-tree.c
+++ b/builtin-diff-tree.c
@@ -68,7 +68,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
        int read_stdin = 0;
 
        init_revisions(opt, prefix);
-       git_config(git_default_config); /* no "diff" UI options */
+       git_config(git_diff_basic_config); /* no "diff" UI options */
        nr_sha1 = 0;
        opt->abbrev = 0;
        opt->diff = 1;