diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-06-22 23:20:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-22 23:20:40 -0700 |
| commit | 0f2890acd999e63892d0b5b401e70bdaefe3ba51 (patch) | |
| tree | 3264e88edd83e00edac81ea2ef174740c24287bf /Makefile | |
| parent | Two trivial -Wcast-qual fixes (diff) | |
| parent | filter-branch: subdirectory filter needs --full-history (diff) | |
| download | tgif-0f2890acd999e63892d0b5b401e70bdaefe3ba51.tar.xz | |
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-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 \ |