From: Enrico Weigelt Date: Fri, 24 Sep 2010 20:18:07 GMT Subject: Re: Filter certain files on rebase Message-ID: <20100924201807.GA29566@nibiru.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 ----------------------------------------------------------------------