From: Linus Torvalds <torvalds@osdl.org>
To: Juergen Ruehle <j.ruehle@bmiag.de>
Cc: Jon Smirl <jonsmirl@gmail.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: Diffs from CVS keyword expansion
Date: Thu, 30 Nov 2006 23:44:41 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0611302340030.3695@woody.osdl.org> (raw)
In-Reply-To: <17775.54363.376000.140259@lapjr.intranet.kiel.bmiag.de>
On Fri, 1 Dec 2006, Juergen Ruehle wrote:
> Jon Smirl writes:
> > Anyone have a nice script for suppressing diffs caused by CVS keyword
> > expansion when someone checked the kernel sources into CVS?
>
> I usually just say (with GNU diff)
>
> diff -I $$ ...
>
> which is crude, but should be enough to get rid of the hunks listed by
> you.
>
> You might also want -x CVS if you have the metadata files.
Also, if you are actually _using_ CVS to check it out, use
cvs co -ko
I think, to not check out with keyword expansion at all.
(Also usable with "cvs diff -ko", I think)
Linus
PS. Clueless user alert: I have happily not used CVS in years and years,
next prev parent reply other threads:[~2006-12-01 7:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-01 3:56 Diffs from CVS keyword expansion Jon Smirl
2006-12-01 7:06 ` Juergen Ruehle
2006-12-01 7:44 ` Linus Torvalds [this message]
2006-12-01 15:33 ` Jon Smirl
2006-12-05 12:14 ` Uwe Kleine-Koenig
2006-12-05 19:45 ` Randal L. Schwartz
2006-12-05 19:48 ` Johannes Schindelin
2006-12-06 10:05 ` Uwe Kleine-Koenig
2006-12-06 10:08 ` Randal L. Schwartz
2006-12-05 19:55 ` Junio C Hamano
2006-12-05 20:30 ` Robin Rosenberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0611302340030.3695@woody.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=j.ruehle@bmiag.de \
--cc=jonsmirl@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).