projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/thin' into next
[git.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index
1c3b09b
..
eaff444
100644
(file)
--- a/
read-tree.c
+++ b/
read-tree.c
@@
-717,6
+717,7
@@
int main(int argc, char **argv)
merge_fn_t fn = NULL;
setup_git_directory();
merge_fn_t fn = NULL;
setup_git_directory();
+ git_config(git_default_config);
newfd = hold_index_file_for_update(&cache_file, get_index_file());
if (newfd < 0)
newfd = hold_index_file_for_update(&cache_file, get_index_file());
if (newfd < 0)