diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-11 23:06:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-11 23:06:32 -0800 |
| commit | 618d18b5aa9420fe446f7a1ed69d65fb45fa49b7 (patch) | |
| tree | e4a1e9cbad5793d477ebdbae605bac0729e31f29 | |
| parent | am: switch --resolved to --continue (diff) | |
| parent | filter-branch: Fix error message for --prune-empty --commit-filter (diff) | |
| download | git-618d18b5aa9420fe446f7a1ed69d65fb45fa49b7.tar.gz git-618d18b5aa9420fe446f7a1ed69d65fb45fa49b7.zip | |
Merge branch 'maint'
* maint:
filter-branch: Fix error message for --prune-empty --commit-filter
| -rwxr-xr-x | 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 e95845c0d6..88fb0f070e 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 |