summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Helwig <jacob.helwig@gmail.com>2010-02-12 02:46:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-12 06:12:36 (GMT)
commit5da81713703583e795a4faa6a79074b53edb5a9a (patch)
tree41f8beba04dd1eeae46aa3d75116a0f5c0640db5
parent4133fd25525022f99d2c7ba339618433bdd919fe (diff)
downloadgit-5da81713703583e795a4faa6a79074b53edb5a9a.zip
git-5da81713703583e795a4faa6a79074b53edb5a9a.tar.gz
git-5da81713703583e795a4faa6a79074b53edb5a9a.tar.bz2
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>
-rwxr-xr-xgit-filter-branch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index cb9d202..3dfb2c3 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