daemon: new option --detach to run git-daemon in background

diff --git a/builtin-diff.c b/builtin-diff.c
index d520c7ca294fcd8e619135bfe8932650d850724c..ae901dd25ea4d8d82752db5b28f354fd2eadfb56 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -176,7 +176,7 @@ static int builtin_diff_tree(struct rev_info *revs,
                usage(builtin_diff_usage);
 
        /* We saw two trees, ent[0] and ent[1].
-        * if ent[1] is unintesting, they are swapped
+        * if ent[1] is uninteresting, they are swapped
         */
        if (ent[1].item->flags & UNINTERESTING)
                swap = 1;
@@ -250,7 +250,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
         * Other cases are errors.
         */
 
-       git_config(git_diff_config);
+       git_config(git_diff_ui_config);
        init_revisions(&rev);
 
        argc = setup_revisions(argc, argv, &rev, NULL);