Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755657Ab0DUPbU (ORCPT ); Wed, 21 Apr 2010 11:31:20 -0400 Received: from mail.gmx.net ([213.165.64.20]:40062 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755554Ab0DUPbS convert rfc822-to-8bit (ORCPT ); Wed, 21 Apr 2010 11:31:18 -0400 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX1/vinJc86nvKqtXgw7y2PjspTEkhDtrEgd02ERjV2 JD4C4tNrDXZJ59 Date: Wed, 21 Apr 2010 17:31:34 +0200 (CEST) From: Guennadi Liakhovetski To: =?utf-8?Q?Am=C3=A9rico?= Wang cc: Michal Marek , linux-kernel@vger.kernel.org Subject: Re: [PATCH] kbuild: add *.rej pattern to .gitignore In-Reply-To: <20100421152837.GA13861@hack> Message-ID: References: <20100421152837.GA13861@hack> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=ISO-8859-15 Content-Transfer-Encoding: 8BIT X-Y-GMX-Trusted: 0 X-FuHaFi: 0.55000000000000004 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1113 Lines: 41 On Wed, 21 Apr 2010, Américo Wang wrote: > On Wed, Apr 21, 2010 at 01:47:29PM +0200, Guennadi Liakhovetski wrote: > >Tell git to ignore .rej files, generated by patch(1). > > > >Signed-off-by: Guennadi Liakhovetski > > NACK. > > You have to handle *.rej files, not leaving them there. Hm? I know I have to handle them, and I do handle them, but IMHO it's entirely valid and up to the user to leave them where they are. You could apply similar argument to *.orig or to *~ files. In other words, I'm not convinced. Thanks Guennadi > >--- > >diff --git a/.gitignore b/.gitignore > >index a2939fc..17ababa 100644 > >--- a/.gitignore > >+++ b/.gitignore > >@@ -74,5 +74,6 @@ GSYMS > > GTAGS > > > > *.orig > >+*.rej > > *~ > > \#*# --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/