diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-08 01:25:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-08 01:25:59 -0800 |
| commit | 5ca15b8af7f018b9ae9da30130f9dcd1a896e0b3 (patch) | |
| tree | e4ae4ad79b5560920696f3983c436b6d34ce18b8 /read-tree.c | |
| parent | 77131db5855ed044e30706aa1219d79126686f00 (diff) | |
| parent | 4bfb6b62ffc9460798ebc78c3a30e4eff7c409d0 (diff) | |
| download | git-0.99.9f.tar.gz git-0.99.9f.tar.xz | |
GIT 0.99.9fv0.99.9f
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'read-tree.c')
| -rw-r--r-- | read-tree.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/read-tree.c b/read-tree.c index 6a456ae61..df156ea0d 100644 --- a/read-tree.c +++ b/read-tree.c @@ -633,6 +633,8 @@ int main(int argc, char **argv) if (newfd < 0) die("unable to create new cachefile"); + git_config(git_default_config); + merge = 0; reset = 0; for (i = 1; i < argc; i++) { |