* Filter certain files on rebase
@ 2010-09-21 8:00 Enrico Weigelt
2010-09-24 11:07 ` Ævar Arnfjörð Bjarmason
2010-09-27 1:51 ` Elijah Newren
0 siblings, 2 replies; 4+ messages in thread
From: Enrico Weigelt @ 2010-09-21 8:00 UTC (permalink / raw)
To: git
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
----------------------------------------------------------------------
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Filter certain files on rebase
2010-09-21 8:00 Filter certain files on rebase Enrico Weigelt
@ 2010-09-24 11:07 ` Ævar Arnfjörð Bjarmason
2010-09-24 20:18 ` Enrico Weigelt
2010-09-27 1:51 ` Elijah Newren
1 sibling, 1 reply; 4+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-24 11:07 UTC (permalink / raw)
To: weigelt, git
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Filter certain files on rebase
2010-09-24 11:07 ` Ævar Arnfjörð Bjarmason
@ 2010-09-24 20:18 ` Enrico Weigelt
0 siblings, 0 replies; 4+ messages in thread
From: Enrico Weigelt @ 2010-09-24 20:18 UTC (permalink / raw)
To: git
* Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
> 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
----------------------------------------------------------------------
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Filter certain files on rebase
2010-09-21 8:00 Filter certain files on rebase Enrico Weigelt
2010-09-24 11:07 ` Ævar Arnfjörð Bjarmason
@ 2010-09-27 1:51 ` Elijah Newren
1 sibling, 0 replies; 4+ messages in thread
From: Elijah Newren @ 2010-09-27 1:51 UTC (permalink / raw)
To: weigelt, git
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-09-27 1:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-21 8:00 Filter certain files on rebase Enrico Weigelt
2010-09-24 11:07 ` Ævar Arnfjörð Bjarmason
2010-09-24 20:18 ` Enrico Weigelt
2010-09-27 1:51 ` Elijah Newren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).