X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-filter-branch.sh;h=88fb0f070e5f32c62ae47f90f1f27ffeef836d8f;hb=5bfd53629e93113a17fe7d6a7a24554dc3c17cdb;hp=e95845c0d6345ccc341d70d17431235197dfd967;hpb=e7ec9de67639d7c1715b450f54d297cc38e25867;p=git.git diff --git a/git-filter-branch.sh b/git-filter-branch.sh index e95845c0d..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