X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-filter-branch.sh;h=88fb0f070e5f32c62ae47f90f1f27ffeef836d8f;hb=c7e375de4228cdb86e2582e2eda7fa3a6f352fc2;hp=81fd3dba3de9671a1202bea389ad192cdd31c6ef;hpb=d3b91fad1843e98fde9c287f72315bd456e18f2c;p=git.git

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 81fd3dba3..88fb0f070 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -207,7 +207,7 @@ t,)
 ,*)
 	;;
 *)
-	die "Cannot set --prune-empty and --filter-commit at the same time"
+	die "Cannot set --prune-empty and --commit-filter at the same time"
 esac
 
 case "$force" in
@@ -331,7 +331,7 @@ while read commit parents; do
 			die "tree filter failed: $filter_tree"
 
 		(
-			git diff-index -r --name-only $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 \