author | Junio C Hamano <gitster@pobox.com> | |
Fri, 12 Feb 2010 07:06:32 +0000 (23:06 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 12 Feb 2010 07:06:32 +0000 (23:06 -0800) |
* maint:
filter-branch: Fix error message for --prune-empty --commit-filter
filter-branch: Fix error message for --prune-empty --commit-filter
git-filter-branch.sh | patch | blob | history |
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
,*)
;;
*)
- 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