Merge branch 'js/config-cb'
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 May 2008 21:25:02 +0000 (14:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 May 2008 21:25:02 +0000 (14:25 -0700)
* js/config-cb:
Provide git_config with a callback-data parameter

Conflicts:

builtin-add.c
builtin-cat-file.c

No differences found