提交 5da81713 编写于 作者: J Jacob Helwig 提交者: 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: NJacob Helwig <jacob.helwig@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册