From: Jacob Helwig Date: Fri, 12 Feb 2010 02:46:22 GMT Subject: [PATCH] filter-branch: Fix error message for --prune-empty --commit-filter Message-ID: <1265942782-16257-1-git-send-email-jacob.helwig@gmail.com> In-Reply-To: <4B6FE325.5000909@drmicha.warpmail.net> 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 --- Sorry for taking so long to respond to this. I wasn't quite happy with the suggested commit message, but hopefully this will make everyone happy. 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.6.6.1