{"thread":{"id":"25221","subject":"Filter certain files on rebase","startedAt":"2010-09-21T08:00:49Z","lastAt":"2010-09-27T01:51:12Z","messageCount":4,"participants":["Enrico Weigelt","Ævar Arnfjörð Bjarmason","Elijah Newren"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"151461","messageId":"20100921080049.GB27575@nibiru.local","threadId":"25221","inReplyTo":null,"subject":"Filter certain files on rebase","fromName":"Enrico Weigelt","fromEmail":"weigelt@metux.de","sentAt":"2010-09-21T08:00:49Z","receivedAt":"2010-09-21T08:00:49Z","isPatch":false,"sender":{"key":"weigelt@metux.de","avatar":null},"body":"\nHi folks,\n\n\nis it somehow possible to filter out certain files on rebase\noperations. The problem is: I'm maintaining a lot of downstream\nbranches, where sometimes upstream leaves in autogenerated files\n(eg. configure) which I want to get rid of. When I just remove\nthem by another commit, I'll get conflicts on next rebase.\n\n\ncu\n-- \n----------------------------------------------------------------------\n Enrico Weigelt, metux IT service -- http://www.metux.de/\n\n phone:  +49 36207 519931  email: weigelt@metux.de\n mobile: +49 151 27565287  icq:   210169427         skype: nekrad666\n----------------------------------------------------------------------\n Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme\n----------------------------------------------------------------------\n"},{"id":"151464","messageId":"AANLkTi=JKiJpi8XUkFppueeqFVGRqHhUj=Lzc-a6QGod@mail.gmail.com","threadId":"25221","inReplyTo":"20100921080049.GB27575@nibiru.local","subject":"Re: Filter certain files on rebase","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-24T11:07:23Z","receivedAt":"2010-09-24T11:07:23Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Tue, Sep 21, 2010 at 08:00, Enrico Weigelt <weigelt@metux.de> wrote:\n> is it somehow possible to filter out certain files on rebase\n> operations. The problem is: I'm maintaining a lot of downstream\n> branches, where sometimes upstream leaves in autogenerated files\n> (eg. configure) which I want to get rid of. When I just remove\n> them by another commit, I'll get conflicts on next rebase.\n\nYou *could* with the \"edit\" option to interactive rebase and a custom\neditor script, but this is the sort of thing git-filter-branch(1) is\nfor.\n"},{"id":"151774","messageId":"20100924201807.GA29566@nibiru.local","threadId":"25221","inReplyTo":"AANLkTi=JKiJpi8XUkFppueeqFVGRqHhUj=Lzc-a6QGod@mail.gmail.com","subject":"Re: Filter certain files on rebase","fromName":"Enrico Weigelt","fromEmail":"weigelt@metux.de","sentAt":"2010-09-24T20:18:07Z","receivedAt":"2010-09-24T20:18:07Z","isPatch":false,"sender":{"key":"weigelt@metux.de","avatar":null},"body":"* Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:\n> On Tue, Sep 21, 2010 at 08:00, Enrico Weigelt <weigelt@metux.de> wrote:\n> > is it somehow possible to filter out certain files on rebase\n> > operations. The problem is: I'm maintaining a lot of downstream\n> > branches, where sometimes upstream leaves in autogenerated files\n> > (eg. configure) which I want to get rid of. When I just remove\n> > them by another commit, I'll get conflicts on next rebase.\n> \n> You *could* with the \"edit\" option to interactive rebase and a custom\n> editor script, but this is the sort of thing git-filter-branch(1) is\n> for.\n\nSo I should run the upstream branch through git-filter-branch\nbefore rebasing to it ?\n\n\ncu\n-- \n----------------------------------------------------------------------\n Enrico Weigelt, metux IT service -- http://www.metux.de/\n\n phone:  +49 36207 519931  email: weigelt@metux.de\n mobile: +49 151 27565287  icq:   210169427         skype: nekrad666\n----------------------------------------------------------------------\n Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme\n----------------------------------------------------------------------\n"},{"id":"151776","messageId":"AANLkTikP7=AnfSXiYWiKEAh-2965HmGyDrALv-eSYopa@mail.gmail.com","threadId":"25221","inReplyTo":"20100921080049.GB27575@nibiru.local","subject":"Re: Filter certain files on rebase","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2010-09-27T01:51:12Z","receivedAt":"2010-09-27T01:51:12Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Tue, Sep 21, 2010 at 2:00 AM, Enrico Weigelt <weigelt@metux.de> wrote:\n> Hi folks,\n>\n>\n> is it somehow possible to filter out certain files on rebase\n> operations. The problem is: I'm maintaining a lot of downstream\n> branches, where sometimes upstream leaves in autogenerated files\n> (eg. configure) which I want to get rid of. When I just remove\n> them by another commit, I'll get conflicts on next rebase.\n\nUse a custom merge driver;\nhttp://stackoverflow.com/questions/928646/how-do-i-tell-git-to-always-select-my-local-version-for-conflicted-merges-on-a-sp/930495#930495\nhas a pretty detailed example.\n"}]}