Running filter-branch with --prune-empty and --commit-filter, no longer incorrectly reports that you had tried to run '--filter-commit' in combination with '--prune-empty'. Signed-off-by: Jacob Helwig <jacob.helwig@xxxxxxxxx> --- Sorry for the re-send. Forgot the SOB... 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 e95845c..88fb0f0 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 -- 1.7.0.rc1.50.g8424 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html