diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-25 14:25:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 14:25:02 -0700 |
| commit | 9bd81e4249a419f9cde8fd68e033e263533f4914 (patch) | |
| tree | 5a4c77cc648dc720e40c76e83a489ab40e70e187 /builtin-cat-file.c | |
| parent | 450c5aed06ecf60084f993f688b549ffa377b64e (diff) | |
| parent | ef90d6d4208a5130185b04f06e5f90a5f9959fe3 (diff) | |
| download | git-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.gz | |
Merge branch 'js/config-cb'v1.5.6-rc0
* js/config-cb:
Provide git_config with a callback-data parameter
Conflicts:
builtin-add.c
builtin-cat-file.c
Diffstat (limited to 'builtin-cat-file.c')
| -rw-r--r-- | builtin-cat-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-cat-file.c b/builtin-cat-file.c index 5ef15a4fa9..200345e7fb 100644 --- a/builtin-cat-file.c +++ b/builtin-cat-file.c @@ -222,7 +222,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) OPT_END() }; - git_config(git_default_config); + git_config(git_default_config, NULL); if (argc != 3 && argc != 2) usage_with_options(cat_file_usage, options); |