Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755418Ab0FCTf3 (ORCPT ); Thu, 3 Jun 2010 15:35:29 -0400 Received: from bombadil.infradead.org ([18.85.46.34]:34730 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752240Ab0FCTf2 (ORCPT ); Thu, 3 Jun 2010 15:35:28 -0400 Date: Thu, 3 Jun 2010 15:35:27 -0400 From: Kyle McMartin To: Lin Mac Cc: Git Mailing List , linux-kernel@vger.kernel.org Subject: Re: How do I ignore the changes made by CVS keyword substitution efficiently? Message-ID: <20100603193527.GK28492@bombadil.infradead.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 805 Lines: 17 On Fri, Jun 04, 2010 at 03:13:29AM +0800, Lin Mac wrote: > I'm merging kernel from others, and they used CVS to manage their > code, and so do some part of linux kernel. Unfortunatly CVS would > substitude the keywords in the source, result in unecessary changes in > the code, like the one in the following diff. In fact, there are > around 1174 of CVS keywords in the kernel source. I don't want those > useless changes to get into my tree. You want the -ko option to cvs checkout/update which will use the original keywords from the import. regards, Kyle -- 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/