From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri, 24 Sep 2010 11:07:23 GMT
Subject: Re: Filter certain files on rebase
Message-ID: <AANLkTi=JKiJpi8XUkFppueeqFVGRqHhUj=Lzc-a6QGod@mail.gmail.com>
In-Reply-To: <20100921080049.GB27575@nibiru.local>

On Tue, Sep 21, 2010 at 08:00, Enrico Weigelt <weigelt@metux.de> 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.