From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Nov 2008 03:24:36 +0000 (-0800)
Subject: Merge branch 'rs/strbuf-expand'
X-Git-Tag: v1.6.1-rc1~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2d2b3fd8485eee6dd238b930f2592535730089a4;p=git.git

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
---

2d2b3fd8485eee6dd238b930f2592535730089a4