summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff/diff.1
AgeCommit message (Collapse)AuthorFilesLines
2020-02-08correct Research Unix edition "appeared in" use in HISTORYjsg1-3/+3
Starting from "Combined Table of Contents" in Doug McIlroy's "A Research UNIX Reader" a table of which edition manuals appeared in. Checked against manuals from bitsavers/TUHS and source from TUHS where available. Ingo points out there are cases where something is included but not documented until a later release. bcd(6) v6 v7 printf(3) v2 v4 abort(3) v5 v6 system(3) v6 v7 fmod(3) v5 v6 ok schwarze@
2019-03-20remove incorrect escaping of '+', correctly escape '-', and garbage collect .Tnschwarze1-9/+6
2015-11-24fix an error in the text; from donald allenjmc1-3/+3
ok millert
2015-10-26no more TMPDIR;jmc1-5/+2
2015-10-26remove TMPDIR support. ok millerttedu1-13/+2
2015-10-05Remove the non-standard -l flag that pipes the output through pr(1).millert1-11/+3
Based on a diff from and OK deraadt@
2014-02-13TMPDIR is an extension;jmc1-4/+7
while here, converting \*(Gt to >, in accordance with some advice from ingo
2013-07-16where "-" represents stdin, just use Sq, not Fl, since it's not a flag;jmc1-3/+3
from Jan Stary
2013-01-20remove obsolete BUGS (cmp is not run internally); ok ottojmc1-18/+2
2011-02-03add a reference to the "An Algorithm for Differential File Comparison" paper;jmc1-2/+10
diff originally from Daniel Dickman, but otto suggested this paper ok otto millert
2010-09-03add an EXIT STATUS section for /usr/bin;jmc1-4/+4
2010-08-18Add a cross reference to patch(1)schwarze1-6/+4
as suggested by Thomas de Grivel <billitch at gmail dot com> on tech@. While here, remove the SEE ALSO entries (but not the cross references at the appropriate places!) to fnmatch(3), re_format(7), and pr(1). Their relevance is restricted to one single option each, the latter is mostly obsolete nowadays anyway, and the number of SEE ALSO entries is so large that SEE ALSO is starting to look confusing. "yes" jmc@
2010-02-21`-q' is an output option, hence it is mutually exclusive.sobrado1-9/+9
ok jmc@
2009-11-09move mutually exclusive options (-c, -e, -f, -n and -u) to the right place.sobrado1-4/+4
ok jmc@
2009-02-08updates to IEEE Std 1003.1-2008;jmc1-2/+2
2009-02-08bump the posix reference in STANDARDS to IEEE Std 1003.1-2008, with a fewjmc1-3/+3
updates to follow;
2007-05-31convert to new .Dd format;jmc1-2/+2
2007-05-30- use a consistent text for STANDARDSjmc1-3/+7
- note which options are extensions to POSIX
2007-03-01sort options/synopsis/usage();jmc1-46/+44
from Igor Sobrado
2006-05-05- no need to escape thesejmc1-4/+4
2005-12-27+.Xr sdiff 1 ,jmc1-1/+2
2005-01-06clarify what -a does;jmc1-2/+11
prod and ok deraadt@
2004-12-09If the -L option is specified twice, use it for the second filenamemillert1-2/+3
like GNU diff does. Adapted from a diff by YAMAMOTO Takashi
2004-06-20Implement -I option: ignore changes matching a set of regexes. Fromotto1-14/+35
Jared Yanovich, with twists from millert@ and me. Testing by brad@, sturm@ and pval@. ok millert@
2004-03-16POSIX specifies that in directory mode device special files andmillert1-1/+4
FIFOs shall be skipped. Other types of files may be skipped too (this is implementation-dependent). In directory mode, just skip anything that is not a regular file or directory. OK tedu@
2004-01-25use new .St macro;jmc1-2/+2
2004-01-07Document -p option. ok jmc@otto1-5/+11
2003-09-18 - move `-d' to comparison options, rather then output optionsjmc1-6/+6
- note (again) that output options are mutually exclusive from Andy Isaacson (PR 3479)
2003-09-07 - add -P to SYNOPSISjmc1-5/+5
- remove "mutually exclusive" clause - -c produces 15 *'s, not a dozen - add -a to uage() - sync usage() with SYNOPSIS ok tedu@
2003-07-27Start new sentence on a new line.otto1-4/+4
ok jmc@
2003-07-27- Use a heuristic to bound memory and cpu usage, at the cost ofotto1-7/+12
producing suboptimal diffs for large file containing lots of changes. Switch heuristic off with -d/--minimal (GNU compatible). Some hints from millert@. - Improve performance by reducing the number of realloc(3) calls. ok millert@ tedu@
2003-07-22Fixed the "dot alone on a line" bug.millert1-12/+1
2003-07-22Bring FILES section up to date.millert1-12/+6
2003-07-22Implement the -L and -T options from GNU diff.millert1-15/+27
2003-07-21Add STANDARDS sectionmillert1-1/+7
2003-07-09Re-implement -l flag; diff -l now works correctly in non-directorymillert1-6/+15
mode (like GNU diff).
2003-07-06Add -q option from GNU diffmillert1-6/+9
2003-07-06Implement -P from GNU diff (like -N but only for files that are missingmillert1-1/+7
from dir1).
2003-07-06Some fairly major changes:millert1-5/+28
o -N is implemented o -X is implemented o -x is implemented o diff.c has been rewritten and GNU long options are now supported o diffdir.c has been rewritten + no longer does fork + exec of /usr/bin/diff + can be called recursively (and will be for -r) o diff.h + don't include any .h files here any more, do it in the .c files + no Bell Labs code in this, gets a UCB copyright (the 32v sources only have a diff.c and there is nothing in common). o diffreg.c + most all remaining globals are now private to diffreg.c + files are only opened once + dynamically allocated objects are either freed or realloced + added missing UCB copyright (there were lots of UCB changes) + print correct thing when -s is specified OK deraadt@
2003-07-04Kill non-standard -l option as discussed with tedu@millert1-11/+1
2003-07-04Kill diff -h, we don't use or want diffh. Discussed w/ tedu@millert1-15/+3
2003-06-28tweak;jmc1-2/+2
ok tedu@
2003-06-27-a to force ascii compare. ok millerttedu1-6/+8
2003-06-26Update with unidiff info and make FILES section fit reality.millert1-24/+61
With input from jmc@
2003-06-25cleanup;jmc1-74/+89
ok deraadt@
2003-06-25this can be 3 term; gwyllion@ace.ulyssis.orgderaadt1-6/+2
2003-06-25cleanup. ansi, headers, correct prototypes, some safer string andtedu1-0/+1
tempfile functions, whitespace, ... no functional improvements yet
2003-06-25man page from 4.4lite2deraadt1-110/+95
2003-06-254.3reno diff. This is free because of the Caldera license. Nasty, but aderaadt1-0/+402
place to start.