git filter branch with -f; git gc --aggressive