# Filter certain files on rebase 4 messages from 2010-09-21 to 2010-09-27. Participants: Enrico Weigelt, Ævar Arnfjörð Bjarmason, Elijah Newren. Thread: https://gitlist.dev/t/25221 ## Enrico Weigelt, 2010-09-21 08:00 Subject: Filter certain files on rebase Message-ID: <20100921080049.GB27575@nibiru.local> URL: https://gitlist.dev/e/20100921080049.GB27575%40nibiru.local ``` 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. cu -- ---------------------------------------------------------------------- Enrico Weigelt, metux IT service -- http://www.metux.de/ phone: +49 36207 519931 email: weigelt@metux.de mobile: +49 151 27565287 icq: 210169427 skype: nekrad666 ---------------------------------------------------------------------- Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme ---------------------------------------------------------------------- ``` ## Ævar Arnfjörð Bjarmason, 2010-09-24 11:07 Subject: Re: Filter certain files on rebase Message-ID: URL: https://gitlist.dev/e/AANLkTi%3DJKiJpi8XUkFppueeqFVGRqHhUj%3DLzc-a6QGod%40mail.gmail.com In-Reply-To: <20100921080049.GB27575@nibiru.local> ``` On Tue, Sep 21, 2010 at 08:00, Enrico Weigelt 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. ``` ## Enrico Weigelt, 2010-09-24 20:18 Subject: Re: Filter certain files on rebase Message-ID: <20100924201807.GA29566@nibiru.local> URL: https://gitlist.dev/e/20100924201807.GA29566%40nibiru.local In-Reply-To: ``` * Ævar Arnfjörð Bjarmason wrote: > On Tue, Sep 21, 2010 at 08:00, Enrico Weigelt 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. So I should run the upstream branch through git-filter-branch before rebasing to it ? cu -- ---------------------------------------------------------------------- Enrico Weigelt, metux IT service -- http://www.metux.de/ phone: +49 36207 519931 email: weigelt@metux.de mobile: +49 151 27565287 icq: 210169427 skype: nekrad666 ---------------------------------------------------------------------- Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme ---------------------------------------------------------------------- ``` ## Elijah Newren, 2010-09-27 01:51 Subject: Re: Filter certain files on rebase Message-ID: URL: https://gitlist.dev/e/AANLkTikP7%3DAnfSXiYWiKEAh-2965HmGyDrALv-eSYopa%40mail.gmail.com In-Reply-To: <20100921080049.GB27575@nibiru.local> ``` On Tue, Sep 21, 2010 at 2:00 AM, Enrico Weigelt 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. ```