Merge branch 'maint'

* maint: filter-branch: Fix error message for --prune-empty --commit-filter
git-mirror · Feb 12, 2010 · 618d18b · 618d18b
2 parents c8089af + 5da8171
commit 618d18b
Showing 1 changed file with 1 addition and 1 deletion.
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