Merge branch 'maint'

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 22b6ed4a784192bb865dff83731255b1979a1e39..ea59015baa2507fdc8fe77d1c77ebdb2d5db2fa7 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -281,7 +281,7 @@ while read commit parents; do
                        die "Could not checkout the index"
                # files that $commit removed are now still in the working tree;
                # remove them, else they would be added again
-               git clean -q -f -x
+               git clean -d -q -f -x
                eval "$filter_tree" < /dev/null ||
                        die "tree filter failed: $filter_tree"