pull: pass --allow-unrelated-histories to "git merge"

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 5e094ce18d9d31fe313e7ccf87ff72da49c8bf39..86b2ff1e07614846465109dcb4b9afed11013839 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -361,7 +361,7 @@ while read commit parents; do
                        die "tree filter failed: $filter_tree"
 
                (
-                       git diff-index -r --name-only --ignore-submodules $commit &&
+                       git diff-index -r --name-only --ignore-submodules $commit -- &&
                        git ls-files --others
                ) > "$tempdir"/tree-state || exit
                git update-index --add --replace --remove --stdin \