git-am: Add am.keepcr and --no-keep-cr to override it

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index e95845c0d6345ccc341d70d17431235197dfd967..88fb0f070e5f32c62ae47f90f1f27ffeef836d8f 100755 (executable)
--- 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