Merge branch 'jc/diff'

diff --git a/builtin-diff.c b/builtin-diff.c
index efd315240f0d8434bc378bf43b866588f6f4e42e..dca223235de6ef61407bd7e7625687ab71918186 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -250,8 +250,9 @@ int cmd_diff(int argc, const char **argv, char **envp)
         * Other cases are errors.
         */
 
-       git_config(git_diff_ui_config);
        init_revisions(&rev);
+       git_config(git_diff_ui_config);
+       diff_setup(&rev.diffopt);
 
        argc = setup_revisions(argc, argv, &rev, NULL);
        if (!rev.diffopt.output_format) {