summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-12-20 17:39:41 +0100
committerJunio C Hamano <junkio@cox.net>2006-12-21 23:10:14 -0800
commit658f3650273abd6888c964b9fb1291c603306df8 (patch)
tree55cd330d65c42fe611ac1b6401ddc83ae7489400 /Makefile
parentad8e72cba8e8dee8fccf11d98f197a44b5e3c10a (diff)
downloadgit-658f3650273abd6888c964b9fb1291c603306df8.tar.gz
Make git-rerere a builtin
The perl version used modules which are non-standard in some setups. This patch brings the full power of rerere to a wider audience. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 76511045a8..154bf4cf52 100644
--- a/Makefile
+++ b/Makefile
@@ -174,7 +174,6 @@ SCRIPT_SH = \
SCRIPT_PERL = \
git-archimport.perl git-cvsimport.perl git-relink.perl \
- git-rerere.perl \
git-cvsserver.perl \
git-svnimport.perl git-cvsexportcommit.perl \
git-send-email.perl git-svn.perl
@@ -289,6 +288,7 @@ BUILTIN_OBJS = \
builtin-push.o \
builtin-read-tree.o \
builtin-repo-config.o \
+ builtin-rerere.o \
builtin-rev-list.o \
builtin-rev-parse.o \
builtin-rm.o \