From: Jacob Helwig <jacob.helwig@gmail.com>
Date: Fri, 12 Feb 2010 02:46:22 +0000 (-0800)
Subject: filter-branch: Fix error message for --prune-empty --commit-filter
X-Git-Tag: v1.7.0~1^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5da81713703583e795a4faa6a79074b53edb5a9a;p=git.git

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 <jacob.helwig@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index cb9d2022c..3dfb2c338 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