On Tue, Sep 21, 2010 at 2:00 AM, Enrico Weigelt <weigelt@xxxxxxxx> wrote: > Hi folks, > > > 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. Use a custom merge driver; http://stackoverflow.com/questions/928646/how-do-i-tell-git-to-always-select-my-local-version-for-conflicted-merges-on-a-sp/930495#930495 has a pretty detailed example. -- 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