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-merge-base.c | |
| parent | 450c5aed06ecf60084f993f688b549ffa377b64e (diff) | |
| parent | ef90d6d4208a5130185b04f06e5f90a5f9959fe3 (diff) | |
| download | git-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.gz git-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.xz | |
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-merge-base.c')
| -rw-r--r-- | builtin-merge-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge-base.c b/builtin-merge-base.c index 0108e22ad..bcf9395aa 100644 --- a/builtin-merge-base.c +++ b/builtin-merge-base.c @@ -28,7 +28,7 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix) unsigned char rev1key[20], rev2key[20]; int show_all = 0; - git_config(git_default_config); + git_config(git_default_config, NULL); while (1 < argc && argv[1][0] == '-') { const char *arg = argv[1]; |