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.