Merge branch 'nd/completion-aliasfiletype-typofix'

diff --git a/builtin/commit.c b/builtin/commit.c
index 5571d4a3e2be5ee8a71b7d5dba72b782c848f15e..5240f112257566a13ef0697783c713c822c7b256 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -161,9 +161,9 @@ static void determine_whence(struct wt_status *s)
 static void status_init_config(struct wt_status *s, config_fn_t fn)
 {
        wt_status_prepare(s);
+       init_diff_ui_defaults();
        git_config(fn, s);
        determine_whence(s);
-       init_diff_ui_defaults();
        s->hints = advice_status_hints; /* must come after git_config() */
 }