Merge branch 'sb/maint-rebase' into maint

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 80e99e539477cbd7266b19c1bd90d424cf1341ee..d04c346e12fb73539e9910951744e9d5558ad4d3 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -234,7 +234,7 @@ case "$filter_subdir" in
        ;;
 *)
        git rev-list --reverse --topo-order --default HEAD \
-               --parents --full-history "$@" -- "$filter_subdir"
+               --parents "$@" -- "$filter_subdir"
 esac > ../revs || die "Could not get the commits"
 commits=$(wc -l <../revs | tr -d " ")