Merge branch 'js/filter'
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 Jun 2007 06:20:40 +0000 (23:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 Jun 2007 06:20:40 +0000 (23:20 -0700)
* 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

1  2 
Makefile

diff --cc Makefile
Simple merge