Merge branch 'maint-1.5.4' into maint
commit6233a5210ef64ba31bbf0e867e03e9176e0aace9
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 May 2008 01:55:33 +0000 (3 18:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 May 2008 01:55:33 +0000 (3 18:55 -0700)
treea6ae9f4ec4e25184cf85a0d78d02b1f16cb0cc4c
parent278863180a280304d6b7f4ad6f11c1a810463507
parenta1748890dbfba4286c54fc9a3ce5786dfa25be33
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  filter-branch: Documentation fix.
Documentation/git-filter-branch.txt