aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-19 16:57:11 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-19 16:57:11 -0700
commit667661d46ef3de6ec38d915f048b4008c0b7c27d (patch)
treeaab9f9cec4a3218f786552460a633875ec76bb06 /Makefile
parent12bb2035e9e28900a0a2ce36c5f38687a22c5157 (diff)
parentd3bd4ee1a5cc771b86f73dd0f4a2bea6f652b20a (diff)
downloadgit-667661d46ef3de6ec38d915f048b4008c0b7c27d.tar.gz
git-667661d46ef3de6ec38d915f048b4008c0b7c27d.tar.xz
Merge branch 'eb/quilt'
* eb/quilt: Implement a --dry-run option to git-quiltimport Implement git-quiltimport
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e80401029..3a31ce015 100644
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,7 @@ SCRIPT_SH = \
git-applymbox.sh git-applypatch.sh git-am.sh \
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
git-merge-resolve.sh git-merge-ours.sh \
- git-lost-found.sh
+ git-lost-found.sh git-quiltimport.sh
SCRIPT_PERL = \
git-archimport.perl git-cvsimport.perl git-relink.perl \