{"thread":{"id":"19442","subject":"Ignoring svn custom id lines on merge","startedAt":"2009-05-22T20:30:27Z","lastAt":"2009-05-22T20:30:27Z","messageCount":1,"participants":["Renato Botelho"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"114486","messageId":"747dc8f30905221330r691dc58cwf21a0070e9652aaf@mail.gmail.com","threadId":"19442","inReplyTo":null,"subject":"Ignoring svn custom id lines on merge","fromName":"Renato Botelho","fromEmail":"rbgarga@gmail.com","sentAt":"2009-05-22T20:30:27Z","receivedAt":"2009-05-22T20:30:27Z","isPatch":false,"sender":{"key":"rbgarga@gmail.com","avatar":null},"body":"Hello,\n\nI'm starting tests to move from cvs to git, and i got just one\nproblem on all my tests.\n\nWe maintain a custom copy of FreeBSD sources, so, on\ncvs we did follow when new FreeBSD version is released:\n\n1. Import new freebsd src as a vendor branch\n2. Merge changes on HEAD\n\nI tried to do the same with git, and it worked, but since\nalmost all FreeBSD files has a custom Id like this:\n\n$FreeBSD: release/7.0.0/COPYRIGHT 175036 2008-01-01 09:36:30Z imp $\n\nThese lines always change, because the place they stay\non svn repository (release/7.0.0, 7.1.0, 7.2.0) and git\ngenerated a lot of conflicts to fix manually.\n\nI would like to know if there is a way to configure git to\njust ignore diffs on these lines and use the new one without\nask.\n\nI can do it with diff command ignoring those lines, like this:\n\ndiff -q -I'[$]FreeBSD:.*$'\n\nThank you in advance\n-- \nRenato Botelho\n"}]}