aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-27 19:24:36 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-27 19:24:36 -0800
commit2d2b3fd8485eee6dd238b930f2592535730089a4 (patch)
tree642dc8866db7840ef247164bee3435cf805ee03e /Makefile
parent14de7393f1eca05c99f785cc2f43281da2c46e9e (diff)
parent7de1950cb28cee7d6b1e9cdaf22f30ddcdc5bd01 (diff)
downloadgit-2d2b3fd8485eee6dd238b930f2592535730089a4.tar.gz
git-2d2b3fd8485eee6dd238b930f2592535730089a4.tar.xz
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index acac0ae5d..649cfb819 100644
--- a/Makefile
+++ b/Makefile
@@ -437,7 +437,6 @@ LIB_OBJS += grep.o
LIB_OBJS += hash.o
LIB_OBJS += help.o
LIB_OBJS += ident.o
-LIB_OBJS += interpolate.o
LIB_OBJS += levenshtein.o
LIB_OBJS += list-objects.o
LIB_OBJS += ll-merge.o