threads / discuss / 25221

Filter certain files on rebase

Subject: Filter certain files on rebase

## tl;dr

4 messages between Sep 21, 2010 and Sep 27, 2010.

replies: 3people: 3as markdown or json

Enrico Weigelt· Sep 21, 2010, 08:00 UTC · lore

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· Sep 24, 2010, 11:07 UTC · re: Enrico Weigelt · lore

Re: Filter certain files on rebase

On Tue, Sep 21, 2010 at 08:00, Enrico Weigelt <weigelt@metux.de> wrote:

Show 5 quoted lines

> 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· Sep 24, 2010, 20:18 UTC · re: Ævar Arnfjörð Bjarmason · lore

Re: Filter certain files on rebase

* Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

Show 10 quoted lines

> 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.

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· Sep 27, 2010, 01:51 UTC · re: Enrico Weigelt · lore

Re: Filter certain files on rebase

On Tue, Sep 21, 2010 at 2:00 AM, Enrico Weigelt <weigelt@metux.de> wrote:

Show 8 quoted lines

> 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.