X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-index.c;h=87e10619830ba71654240d424f15cb6db8ac1d65;hb=d5a6aafc90a14382120727e4e81ee1a380e8b194;hp=c9a9f4c74d96ea22b2a6c4c7593bccc3d5396457;hpb=29504118f8528f658fd0bfc02d8d78d4c01dc2cc;p=git.git

diff --git a/diff-index.c b/diff-index.c
index c9a9f4c7..87e10619 100644
--- 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];