summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-12 07:06:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-12 07:06:32 (GMT)
commit618d18b5aa9420fe446f7a1ed69d65fb45fa49b7 (patch)
treee4a1e9cbad5793d477ebdbae605bac0729e31f29
parentc8089af6c6754153d75de74d0f147adcd46a6b59 (diff)
parent5da81713703583e795a4faa6a79074b53edb5a9a (diff)
downloadgit-618d18b5aa9420fe446f7a1ed69d65fb45fa49b7.zip
git-618d18b5aa9420fe446f7a1ed69d65fb45fa49b7.tar.gz
git-618d18b5aa9420fe446f7a1ed69d65fb45fa49b7.tar.bz2
Merge branch 'maint'
* maint: filter-branch: Fix error message for --prune-empty --commit-filter
-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 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