git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Filter certain files on rebase

From
Elijah Newren <newren@gmail.com>
Date
Sep 27, 2010, 01:51 UTC
Message-ID
<AANLkTikP7=AnfSXiYWiKEAh-2965HmGyDrALv-eSYopa@mail.gmail.com>
In-Reply-To
<20100921080049.GB27575@nibiru.local>
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.

Previous: Enrico Weigelt
Message 4 of 4 in “Filter certain files on rebase”
  1. Enrico WeigeltSep 21, 2010
  2. Ævar Arnfjörð BjarmasonSep 24, 2010
  3. Enrico WeigeltSep 24, 2010
  4. Elijah NewrenSep 27, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.