Merge branch 'maint'
* maint: filter-branch: Fix error message for --prune-empty --commit-filter
This commit is contained in:
commit
618d18b5aa
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user