Merge branch 'rk/commit-tree-make-F-verbatim' into maint

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 7073a3eb9769cae1f00e714a93528b33ca651d9c..28f245c8cccbc20c96a189516e9df77d238c7e96 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -554,7 +554,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb)
                return 0;
        }
 
-       return git_color_default_config(var, value, cb);
+       return git_default_config(var, value, cb);
 }
 
 static int omit_in_dense(struct commit *commit, struct commit **rev, int n)