From mboxrd@z Thu Jan 1 00:00:00 1970 From: Francis Galiegue Subject: Re: Can git ignore parts of files Date: Fri, 14 Nov 2008 20:33:50 +0100 Organization: One2team Message-ID: <200811142033.51019.fg@one2team.net> References: <1226690252.6176.9.camel@rotwang.fnordora.org> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git@vger.kernel.org To: Alan X-From: git-owner@vger.kernel.org Fri Nov 14 20:36:42 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1L14T9-0000cK-Ud for gcvg-git-2@gmane.org; Fri, 14 Nov 2008 20:36:40 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754114AbYKNTfV convert rfc822-to-quoted-printable (ORCPT ); Fri, 14 Nov 2008 14:35:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753856AbYKNTfV (ORCPT ); Fri, 14 Nov 2008 14:35:21 -0500 Received: from ns35774.ovh.net ([213.251.185.197]:52838 "EHLO ns35774.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751898AbYKNTfV convert rfc822-to-8bit (ORCPT ); Fri, 14 Nov 2008 14:35:21 -0500 Received: from erwin.kitchen.eel (AOrleans-157-1-134-72.w90-24.abo.wanadoo.fr [90.24.53.72]) (Authenticated sender: fg@one2team.net) by ns35774.ovh.net (Postfix) with ESMTP id 0561A92C002; Fri, 14 Nov 2008 20:35:07 +0100 (CET) User-Agent: KMail/1.9.9 In-Reply-To: <1226690252.6176.9.camel@rotwang.fnordora.org> Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Le Friday 14 November 2008 20:17:32 Alan, vous avez =E9crit=A0: > I have kind of an odd problem that is causing me grief in git. I fig= ure > someone has a good solution here. (Or not, they will soon.) > > I have a couple of kernel .config files that are checked into git. T= hey > are used to test kernel configurations for the nightly builds where I > work. > > We have a bunch of kernel developers working on drivers. When they a= dd > a new driver, they add in the options in the test file to make it > compile in the test builds. > > The problem is that the kernel config file has a timestamp at the top= of > the file that is generated by "make oldconfig" or "make config". Oth= er > than removing the timestamp each time manually, is there a way to get > git to ignore the timestamp on a merge? > > What happens is that the authors submit the changes on a branch in mo= st > cases. Sometimes they have a version of that file that is quite out = of > date. When I go to merge, that one file gives me grief 95% of the ti= me. > > Is there an easy way around this? Am I approaching the problem wrong= ? > Is there a better way to do this? > Do they ever touch to the kernel core? You say that they are developing= =20 drivers, they basically use core kernel interfaces but not modify them = right? =46or quite a few years now, the kernel build system has allowed one to= build=20 drivers out of the kernel tree (but _using_ the kernel tree) fairly eas= ily.=20 Why not go this route? You won't have any conflict problems anymore, _a= nd_=20 you can maintain (and update) your kernel tree regularly. --=20 fge