Merge branch 'maint'

gitster · gitster · commit 618d18b5aa94 · 2010-02-11T23:06:32.000-08:00
* maint:
  filter-branch: Fix error message for --prune-empty --commit-filter
diff --git 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
