Merge branch 'maint'
commit618d18b5aa9420fe446f7a1ed69d65fb45fa49b7
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Feb 2010 07:06:32 +0000 (11 23:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Feb 2010 07:06:32 +0000 (11 23:06 -0800)
treee4a1e9cbad5793d477ebdbae605bac0729e31f29
parentc8089af6c6754153d75de74d0f147adcd46a6b59
parent5da81713703583e795a4faa6a79074b53edb5a9a
Merge branch 'maint'

* maint:
  filter-branch: Fix error message for --prune-empty --commit-filter
git-filter-branch.sh