diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-23 23:52:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-23 23:52:42 -0800 |
| commit | 88d9405600ece221306ac98db68c6bf756e1ff09 (patch) | |
| tree | 68ec7c90369cbf6a9ddbff76e2e574ab0f782793 /merge-base.c | |
| parent | dcd0409fc545e881a61f522eb8f1d1a7e814eb94 (diff) | |
| parent | 1b371f567d9b0094918e128262577b76994eef74 (diff) | |
| download | git-88d9405600ece221306ac98db68c6bf756e1ff09.tar.gz | |
Merge branch 'jc/name' into next
* jc/name:
sha1_name: make core.warnambiguousrefs the default.
sha1_name: warning ambiguous refs.
Diffstat (limited to 'merge-base.c')
| -rw-r--r-- | merge-base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-base.c b/merge-base.c index e73fca7453..07f5ab4d1c 100644 --- a/merge-base.c +++ b/merge-base.c @@ -237,6 +237,7 @@ int main(int argc, char **argv) unsigned char rev1key[20], rev2key[20]; setup_git_directory(); + git_config(git_default_config); while (1 < argc && argv[1][0] == '-') { char *arg = argv[1]; |