diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-06 22:56:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-06 22:56:07 -0800 |
| commit | bd45fec8397f1f0804db1d18af7193be323b0326 (patch) | |
| tree | d167c73fa8da80ad93840de8fdb6e13d6b39f371 /merge-recursive.c | |
| parent | d28f7cb93537554e069667602a7624952e06df50 (diff) | |
| parent | e52775f43857f377aa2aa69f82ac2d2f26dc6297 (diff) | |
| download | git-bd45fec8397f1f0804db1d18af7193be323b0326.tar.gz | |
Merge branch 'maint'
* maint:
Documentation: Transplanting branch with git-rebase --onto
merge-recursive implicitely depends on trust_executable_bit
adjust_shared_perm: chmod() only when needed.
Fix git-runstatus for repositories containing a file named HEAD
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 2ba43ae84b..c81048d7a7 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1308,6 +1308,7 @@ int main(int argc, char *argv[]) const char *branch1, *branch2; struct commit *result, *h1, *h2; + git_config(git_default_config); /* core.filemode */ original_index_file = getenv("GIT_INDEX_FILE"); if (!original_index_file) |