From mboxrd@z Thu Jan 1 00:00:00 1970 From: Enrico Weigelt Subject: Filter certain files on rebase Date: Tue, 21 Sep 2010 10:00:49 +0200 Message-ID: <20100921080049.GB27575@nibiru.local> Reply-To: weigelt@metux.de Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Sep 24 12:43:15 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 1Oz5kI-0003bt-B0 for gcvg-git-2@lo.gmane.org; Fri, 24 Sep 2010 12:43:14 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752345Ab0IXKnI (ORCPT ); Fri, 24 Sep 2010 06:43:08 -0400 Received: from caprica.metux.de ([82.165.128.25]:46105 "EHLO mailgate.caprica.metux.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751139Ab0IXKnH (ORCPT ); Fri, 24 Sep 2010 06:43:07 -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 o8OAdHSf010681 for ; Fri, 24 Sep 2010 12:43:52 +0200 Received: (from uucp@localhost) by mailgate.caprica.metux.de (8.14.4/8.14.4/Submit) with UUCP id o8NLGvY3016258 for git@vger.kernel.org; Thu, 23 Sep 2010 23:16:57 +0200 Received: (from weigelt@localhost) by nibiru.metux.de (8.12.10/8.12.10) id o8L80n5B002757 for git@vger.kernel.org; Tue, 21 Sep 2010 10:00:49 +0200 Mail-Followup-To: git@vger.kernel.org Content-Disposition: inline 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: 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 ----------------------------------------------------------------------