diff options
| author |  Jacob Helwig <jacob.helwig@gmail.com> | 2010-02-11 18:46:22 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-02-11 22:12:36 -0800 |
| commit | 5da81713703583e795a4faa6a79074b53edb5a9a (patch) | |
| tree | 41f8beba04dd1eeae46aa3d75116a0f5c0640db5 | |
| parent | Git 1.6.6.2 (diff) | |
| download | tgif-5da81713703583e795a4faa6a79074b53edb5a9a.tar.xz | |
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-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 cb9d2022cc..3dfb2c3382 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 |