Commit 5da81713 authored by Jacob Helwig's avatar Jacob Helwig Committed by Junio C Hamano

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: default avatarJacob Helwig <jacob.helwig@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 4133fd25
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment