[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.00.1003100223090.30021@chino.kir.corp.google.com>
Date: Wed, 10 Mar 2010 02:25:51 -0800 (PST)
From: David Rientjes <rientjes@...gle.com>
To: Américo Wang <xiyou.wangcong@...il.com>
cc: Linus Torvalds <torvalds@...ux-foundation.org>,
Jiri Slaby <jirislaby@...il.com>,
Jakub Narebski <jnareb@...il.com>, Jiri Slaby <jslaby@...e.cz>,
Andrew Morton <akpm@...ux-foundation.org>, git@...r.kernel.org,
linux-kernel@...r.kernel.org, Johannes Sixt <j.sixt@...covery.net>
Subject: Re: [PATCH 1/1] gitignore: do not ignore include/linux/
On Wed, 10 Mar 2010, Américo Wang wrote:
> >> >> +!/.gitignore
> >> >> +!/.mailmap
> >> >
> >> > Actually you want to *not ignore* .gitignore and .mailmap (and
> >> > .gitattributes which is missing here) anywhere, not only as top-level
> >> > file. So .gitignore and .mailmap should not be prepended with slash.
> >>
> >> <and moved out of the 'Top-level generic files' section then>
> >>
> >
> > Please either revert 3b2a8c8f3c65 or merge the fixed up patch for
> > 2.6.34-rc2, otherwise include/linux will continue to be ignored by git
> > just like it is for 2.6.34-rc1.
>
> Why not apply the patch from Jiri? Since this problem is introduced
> by new version of git, not that commit.
>
Like I said, please either revert the commit that added "linux" to
.gitignore or merge Jiri's patch. I'm not interested in engaging in a
discussion about what can or cannot be merged during rc cycles, I just
hope this is resolved for rc2.
Powered by blists - more mailing lists