Merge branch 'rs/strbuf-expand'
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Nov 2008 03:24:36 +0000 (19:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Nov 2008 03:24:36 +0000 (19:24 -0800)
* rs/strbuf-expand:
remove the unused files interpolate.c and interpolate.h
daemon: deglobalize variable 'directory'
daemon: inline fill_in_extra_table_entries()
daemon: use strbuf_expand() instead of interpolate()
merge-recursive: use strbuf_expand() instead of interpolate()
add strbuf_expand_dict_cb(), a helper for simple cases

1  2 
Makefile
diff --cc Makefile
Simple merge