git.tremily.us Git - git.git/commit

projects / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 450c5ae ef90d6d)

author	Junio C Hamano <gitster@pobox.com>
	Sun, 25 May 2008 21:25:02 +0000 (14:25 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Sun, 25 May 2008 21:25:02 +0000 (14:25 -0700)
commit	9bd81e4249a419f9cde8fd68e033e263533f4914
tree	5a4c77cc648dc720e40c76e83a489ab40e70e187	tree \| snapshot
parent	450c5aed06ecf60084f993f688b549ffa377b64e	commit \| diff
parent	ef90d6d4208a5130185b04f06e5f90a5f9959fe3	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
builtin-apply.c	diff1 \|	diff2 \|	blob \| history
builtin-cat-file.c	diff1 \|	diff2 \|	blob \| history
builtin-checkout.c	diff1 \|	diff2 \|	blob \| history
builtin-clone.c	diff1 \|	\|	blob \| history
builtin-commit.c	diff1 \|	diff2 \|	blob \| history
builtin-gc.c	diff1 \|	diff2 \|	blob \| history
builtin-init-db.c	diff1 \|	diff2 \|	blob \| history
builtin-log.c	diff1 \|	diff2 \|	blob \| history
builtin-mailinfo.c	diff1 \|	diff2 \|	blob \| history
builtin-merge-recursive.c	diff1 \|	diff2 \|	blob \| history
builtin-mv.c	diff1 \|	diff2 \|	blob \| history
builtin-pack-objects.c	diff1 \|	diff2 \|	blob \| history
builtin-rev-list.c	diff1 \|	diff2 \|	blob \| history
builtin-rev-parse.c	diff1 \|	diff2 \|	blob \| history
builtin-update-index.c	diff1 \|	diff2 \|	blob \| history
cache.h	diff1 \|	diff2 \|	blob \| history
config.c	diff1 \|	diff2 \|	blob \| history
diff.c	diff1 \|	diff2 \|	blob \| history
diff.h	diff1 \|	diff2 \|	blob \| history
fast-import.c	diff1 \|	diff2 \|	blob \| history
hash-object.c	diff1 \|	diff2 \|	blob \| history
remote.c	diff1 \|	diff2 \|	blob \| history
wt-status.c	diff1 \|	diff2 \|	blob \| history
wt-status.h	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker