diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-24 02:10:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-24 02:10:55 -0800 |
| commit | 9def2138a17325c68961c3b1e6c967d33f28a4f1 (patch) | |
| tree | ace1cf9adca0334eade813cd1b41acf8422f7efc /Makefile | |
| parent | 9e83266525aad5c6210b9a21be9b1c6996d5544f (diff) | |
| parent | 658f3650273abd6888c964b9fb1291c603306df8 (diff) | |
| download | git-9def2138a17325c68961c3b1e6c967d33f28a4f1.tar.gz git-9def2138a17325c68961c3b1e6c967d33f28a4f1.tar.xz | |
Merge branch 'js/rerere'
* js/rerere:
Make git-rerere a builtin
Add a test for git-rerere
move read_mmfile() into xdiff-interface
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -171,7 +171,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 @@ -288,6 +287,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 \ |