summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-23 06:20:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-23 06:20:40 (GMT)
commit0f2890acd999e63892d0b5b401e70bdaefe3ba51 (patch)
tree3264e88edd83e00edac81ea2ef174740c24287bf /Makefile
parent63daae47e59b72ebec3595ca3e9917e6c595c814 (diff)
parentcfabd6eee1745cfec58cfcb794ce8847e43b888a (diff)
downloadgit-0f2890acd999e63892d0b5b401e70bdaefe3ba51.zip
git-0f2890acd999e63892d0b5b401e70bdaefe3ba51.tar.gz
git-0f2890acd999e63892d0b5b401e70bdaefe3ba51.tar.bz2
Merge branch 'js/filter'
* js/filter: filter-branch: subdirectory filter needs --full-history filter-branch: Simplify parent computation. Teach filter-branch about subdirectory filtering filter-branch: also don't fail in map() if a commit cannot be mapped filter-branch: Use rev-list arguments to specify revision ranges. filter-branch: fix behaviour of '-k' filter-branch: use $(($i+1)) instead of $((i+1)) chmod +x git-filter-branch.sh filter-branch: prevent filters from reading from stdin t7003: make test repeatable Add git-filter-branch
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c09dfaf..0d904a9 100644
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,8 @@ SCRIPT_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-quiltimport.sh git-submodule.sh
+ git-lost-found.sh git-quiltimport.sh git-submodule.sh \
+ git-filter-branch.sh
SCRIPT_PERL = \
git-add--interactive.perl \