From 5da81713703583e795a4faa6a79074b53edb5a9a Mon Sep 17 00:00:00 2001 From: Jacob Helwig Date: Thu, 11 Feb 2010 18:46:22 -0800 Subject: filter-branch: Fix error message for --prune-empty --commit-filter Running filter-branch with --prune-empty and --commit-filter reports: "Cannot set --prune-empty and --filter-commit at the same time". Change it to use the correct option name: --commit-filter Signed-off-by: Jacob Helwig Signed-off-by: Junio C Hamano --- git-filter-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index cb9d2022cc..3dfb2c3382 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 -- cgit v1.2.3