From mboxrd@z Thu Jan 1 00:00:00 1970 From: Enrico Weigelt Subject: Re: Filter certain files on rebase Date: Fri, 24 Sep 2010 22:18:07 +0200 Message-ID: <20100924201807.GA29566@nibiru.local> References: <20100921080049.GB27575@nibiru.local> Reply-To: weigelt@metux.de Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Sep 27 03:04:30 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1P028r-0001vx-36 for gcvg-git-2@lo.gmane.org; Mon, 27 Sep 2010 03:04:29 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758466Ab0I0BEY convert rfc822-to-quoted-printable (ORCPT ); Sun, 26 Sep 2010 21:04:24 -0400 Received: from caprica.metux.de ([82.165.128.25]:33368 "EHLO mailgate.caprica.metux.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754544Ab0I0BEX convert rfc822-to-8bit (ORCPT ); Sun, 26 Sep 2010 21:04:23 -0400 Received: from mailgate.caprica.metux.de (localhost.localdomain [127.0.0.1]) by mailgate.caprica.metux.de (8.14.4/8.14.4) with ESMTP id o8R0h640016814 for ; Mon, 27 Sep 2010 03:05:13 +0200 Received: (from uucp@localhost) by mailgate.caprica.metux.de (8.14.4/8.14.4/Submit) with UUCP id o8QLBHsc017294 for git@vger.kernel.org; Sun, 26 Sep 2010 23:11:17 +0200 Received: (from weigelt@localhost) by nibiru.metux.de (8.12.10/8.12.10) id o8OKI7VP000650 for git@vger.kernel.org; Fri, 24 Sep 2010 22:18:07 +0200 Mail-Followup-To: git@vger.kernel.org Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.1i X-Terror: bin laden, kill bush, Briefbombe, Massenvernichtung, KZ, X-Nazi: Weisse Rasse, Hitlers Wiederauferstehung, 42, X-Antichrist: weg mit schaeuble, ausrotten, heiliger krieg, al quaida, X-Killer: 23, endloesung, Weltuntergang, X-Doof: wer das liest ist doof Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: * =C6var Arnfj=F6r=F0 Bjarmason wrote: > On Tue, Sep 21, 2010 at 08:00, Enrico Weigelt wrot= e: > > 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. >=20 > 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 --=20 ---------------------------------------------------------------------- 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 ----------------------------------------------------------------------