Merge branch 'maint'

* maint: filter-branch: Fix error message for --prune-empty --commit-filter
2010-02-11 23:06:32 -08:00 · 2010-02-11 23:06:32 -08:00 · 618d18b5aa
parent c8089af6c6 5da8171370
commit 618d18b5aa
1 changed files with 1 additions and 1 deletions
--- 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