Merge fixes up to GIT 1.1.3

diff --git a/diff-index.c b/diff-index.c
index c9a9f4c74d96ea22b2a6c4c7593bccc3d5396457..87e10619830ba71654240d424f15cb6db8ac1d65 100644 (file)
--- a/diff-index.c
+++ b/diff-index.c
@@ -116,7 +116,7 @@ static int diff_cache(struct cache_entry **ac, int entries, const char **pathspe
                        /* We come here with ce pointing at stage 1
                         * (original tree) and ac[1] pointing at stage
                         * 3 (unmerged).  show-modified with
-                        * report-mising set to false does not say the
+                        * report-missing set to false does not say the
                         * file is deleted but reports true if work
                         * tree does not have it, in which case we
                         * fall through to report the unmerged state.
@@ -180,7 +180,7 @@ int main(int argc, const char **argv)
        int allow_options = 1;
        int i;
 
-       git_config(git_default_config);
+       git_config(git_diff_config);
        diff_setup(&diff_options);
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];