From: Enrico Weigelt <weigelt@metux.de>
To: git@vger.kernel.org
Subject: Re: Filter certain files on rebase
Date: Fri, 24 Sep 2010 22:18:07 +0200 [thread overview]
Message-ID: <20100924201807.GA29566@nibiru.local> (raw)
In-Reply-To: <AANLkTi=JKiJpi8XUkFppueeqFVGRqHhUj=Lzc-a6QGod@mail.gmail.com>
* Æ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
----------------------------------------------------------------------
next prev parent reply other threads:[~2010-09-27 1:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2010-09-27 1:51 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100924201807.GA29566@nibiru.local \
--to=weigelt@metux.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.