mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-30 03:16:31 +02:00
Code

Merge branch 'maint' 

* maint:
  filter-branch: Fix error message for --prune-empty --commit-filter
This commit is contained in:
Junio C Hamano 2010-02-11 23:06:32 -08:00
parent c8089af6c6 5da8171370
commit 618d18b5aa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-filter-branch.sh
View File

@ -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