Merge branch 'maint'

* maint:
filter-branch: Fix error message for --prune-empty --commit-filter

diff --combined git-filter-branch.sh
index e95845c0d6345ccc341d70d17431235197dfd967,3dfb2c3382bdeae67463d331dd2a08670faf37a0..88fb0f070e5f32c62ae47f90f1f27ffeef836d8f
--- 1/git-filter-branch.sh
--- 2/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@@ -207,7 -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
@@@ -259,6 -259,7 +259,6 @@@ test -s "$tempdir"/heads |
  
  GIT_INDEX_FILE="$(pwd)/../index"
  export GIT_INDEX_FILE
 -git read-tree || die "Could not seed the index"
  
  # map old->new commit ids for rewriting parents
  mkdir ../map || die "Could not create map/ directory"
@@@ -331,7 -332,7 +331,7 @@@ while read commit parents; d
                        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 \
@@@ -462,11 -463,11 +462,11 @@@ if [ "$filter_tag_name" ]; the
                                                "$new_sha1" "$new_ref"
                                git cat-file tag "$ref" |
                                sed -n \
 -                                  -e "1,/^$/{
 +                                  -e '1,/^$/{
                                          /^object /d
                                          /^type /d
                                          /^tag /d
 -                                      }" \
 +                                      }' \
                                    -e '/^-----BEGIN PGP SIGNATURE-----/q' \
                                    -e 'p' ) |
                                git mktag) ||