Jacob Helwig venit, vidit, dixit 08.02.2010 03:38: > 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'. In order to understand this sentence, I had to look twice at the patch text. What's going on is that that typo was there from the beginning, right? (Induced from the name of a script variable, I see.) How about: 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 name "--commit-filter" of the option. > 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 -- 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