[PATCH] filter-branch: Fix error message for --prune-empty --commit-filter

From: Jacob Helwig <jacob.helwig@gmail.com>
Date: Feb 8, 2010, 02:36 UTC
Message-ID: <1265596587-9949-1-git-send-email-jacob.helwig@gmail.com>

Running filter-branch with --prune-empty and --commit-filter, no longer incorrectly reports that you had tried to run '--filter-commit' in combination with '--prune-empty'. ---

This problem with filter-branch's error message was originally brought up by hipe in the IRC channel.

 git-filter-branch.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index e95845c..88fb0f0 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

-- 
1.7.0.rc1.50.g8424