From: Elijah Newren <newren@gmail.com>
To: weigelt@metux.de, git@vger.kernel.org
Subject: Re: Filter certain files on rebase
Date: Sun, 26 Sep 2010 19:51:12 -0600 [thread overview]
Message-ID: <AANLkTikP7=AnfSXiYWiKEAh-2965HmGyDrALv-eSYopa@mail.gmail.com> (raw)
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.
prev parent reply other threads:[~2010-09-27 1:51 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
2010-09-27 1:51 ` Elijah Newren [this message]
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='AANLkTikP7=AnfSXiYWiKEAh-2965HmGyDrALv-eSYopa@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=weigelt@metux.de \
/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 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).