Re: Can git ignore parts of files
- From
Daniel Barkalow <barkalow@iabervon.org>
- Date
- Nov 16, 2008, 08:37 UTC
- Message-ID
- <alpine.LNX.1.00.0811160331110.19665@iabervon.org>
- In-Reply-To
- <1226690252.6176.9.camel@rotwang.fnordora.org>
On Fri, 14 Nov 2008, Alan wrote:
Show 15 quoted lines
> 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*