From: Elijah Newren <newren@gmail.com>
Date: Mon, 27 Sep 2010 01:51:12 GMT
Subject: Re: Filter certain files on rebase
Message-ID: <AANLkTikP7=AnfSXiYWiKEAh-2965HmGyDrALv-eSYopa@mail.gmail.com>
In-Reply-To: <20100921080049.GB27575@nibiru.local>

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