![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 28 Nov 2008 03:24:36 +0000 (19:24 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 28 Nov 2008 03:24:36 +0000 (19:24 -0800) | ||
| commit | 2d2b3fd8485eee6dd238b930f2592535730089a4 | |
| tree | 642dc8866db7840ef247164bee3435cf805ee03e | tree | snapshot |
| parent | 14de7393f1eca05c99f785cc2f43281da2c46e9e | commit | diff |
| parent | 7de1950cb28cee7d6b1e9cdaf22f30ddcdc5bd01 | commit | diff |
Merge branch 'rs/strbuf-expand'
* 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
* 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
| Makefile | diff1 | | diff2 | | blob | history |