Merge branch 'js/config-cb' v1.5.6-rc0
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)
commit9bd81e4249a419f9cde8fd68e033e263533f4914
tree5a4c77cc648dc720e40c76e83a489ab40e70e187
parent450c5aed06ecf60084f993f688b549ffa377b64e
parentef90d6d4208a5130185b04f06e5f90a5f9959fe3
Merge branch 'js/config-cb'

* js/config-cb:
  Provide git_config with a callback-data parameter

Conflicts:

builtin-add.c
builtin-cat-file.c
25 files changed:
builtin-add.c
builtin-apply.c
builtin-cat-file.c
builtin-checkout.c
builtin-clone.c
builtin-commit.c
builtin-gc.c
builtin-init-db.c
builtin-log.c
builtin-mailinfo.c
builtin-merge-recursive.c
builtin-mv.c
builtin-pack-objects.c
builtin-rev-list.c
builtin-rev-parse.c
builtin-update-index.c
cache.h
config.c
diff.c
diff.h
fast-import.c
hash-object.c
remote.c
wt-status.c
wt-status.h