Skip to content

Commit 658f365

Browse files
dschoJunio C Hamano
authored andcommitted
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>
1 parent ad8e72c commit 658f365

File tree

4 files changed

+409
-1
lines changed

4 files changed

+409
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ SCRIPT_SH = \
174174

175175
SCRIPT_PERL = \
176176
git-archimport.perl git-cvsimport.perl git-relink.perl \
177-
git-rerere.perl \
178177
git-cvsserver.perl \
179178
git-svnimport.perl git-cvsexportcommit.perl \
180179
git-send-email.perl git-svn.perl
@@ -289,6 +288,7 @@ BUILTIN_OBJS = \
289288
builtin-push.o \
290289
builtin-read-tree.o \
291290
builtin-repo-config.o \
291+
builtin-rerere.o \
292292
builtin-rev-list.o \
293293
builtin-rev-parse.o \
294294
builtin-rm.o \

0 commit comments

Comments
 (0)