On Fri, 14 Nov 2008, Alan wrote: > I have kind of an odd problem that is causing me grief in git. I figure > someone has a good solution here. (Or not, they will soon.) > > I have a couple of kernel .config files that are checked into git. They > 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 add > 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". Other > than removing the timestamp each time manually, is there a way to get > git to ignore the timestamp on a merge? Try the "clean"/"smudge" filter feature documented in gitattributes(5). You should be able to use that to remove the timestamp automatically. -Daniel *This .sig left intentionally blank* -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
