On Tue, Sep 21, 2010 at 08:00, Enrico Weigelt <weigelt@xxxxxxxx> wrote: > is it somehow possible to filter out certain files on rebase > operations. The problem is: I'm maintaining a lot of downstream > branches, where sometimes upstream leaves in autogenerated files > (eg. configure) which I want to get rid of. When I just remove > them by another commit, I'll get conflicts on next rebase. You *could* with the "edit" option to interactive rebase and a custom editor script, but this is the sort of thing git-filter-branch(1) is for. -- 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