June 2003
Intermediate to advanced
336 pages
9h 49m
English
Content preview from Essential CVSBecome an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.
Name
diff — Synonyms: di, dif
Synopsis
cvs [cvs-options] diff [format-options] [-lR] [-Ddate] [-Ddate2] [-ffile] [-kmode] [-rrevision] [-rrevision2] [files...]
Displays the differences between two revisions of a file or files. By
default, diff checks the sandbox copy against
the revision in the repository that the sandbox copy was last
synchronized with. If the files argument is a
directory, all files under that directory are compared and files in
subdirectories are also compared recursively.
See also rdiff.
Standard options
Options described in this section determine which files and revisions
are compared by cvs diff. These options are the
same as the standard options for most CVS commands. The
-k option may be used to slightly modify the
data sent to diff.
-
-D date Display the differences between the current sandbox copy of a file and the latest revision on or before the date or time specified by date.
If two
-Doptions are used, display the differences between the latest revision before the first date and the latest revision before the second date.-
-k mode Run
diffwith the designated keyword-expansion mode. This option overrides the default mode and any sticky modes for each file.The keyword-expansion modes are listed in Section 11.6 of Chapter 11.
-
-l Run
diffon the files in the local directory only. (Do not recurse down subdirectories.)See also
-R.-
-r revision Display the differences between the current sandbox copy and the specified
revision.If two
-roptions are used, display ...
Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Read now
Unlock full access
More than 5,000 organizations count on O’Reilly
O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.Julian F.
I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.Addison B.
I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.Amir M.
I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.