Re: [git-users] Git diff problem with cvs $id$

On Mon, 6 Jul 2015 11:53:26 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com wrote: Remove the it! If you aren't using CVS those lines serve no purpose at all. Even if you do use CVS the line is of dubious usefulness. Unfortunately I can not remove them. They are in an earlier branch

Re: [git-users] Git diff problem with cvs $id$

Any suggestions? Remove the it! If you aren't using CVS those lines serve no purpose at all. Even if you do use CVS the line is of dubious usefulness. Unfortunately I can not remove them. They are in an earlier branch of a software repo, which has more thousand files. So I need a

Re: [git-users] Git diff problem with cvs $id$

So which repo contains expanded keywords? If yours, then do a recursive `sed` (or whatever) invocation on all that thousand of files and make a single commit titled Normalize CVS keywords. Then merge normally. If the foreign repo contains expanded keywords, may be `git rerere`