summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff/diff.1 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Remove the non-standard -l flag that pipes the output through pr(1).millert2015-10-051-11/+3
| | | | Based on a diff from and OK deraadt@
* TMPDIR is an extension;jmc2014-02-131-4/+7
| | | | while here, converting \*(Gt to >, in accordance with some advice from ingo
* where "-" represents stdin, just use Sq, not Fl, since it's not a flag;jmc2013-07-161-3/+3
| | | | from Jan Stary
* remove obsolete BUGS (cmp is not run internally); ok ottojmc2013-01-201-18/+2
|
* add a reference to the "An Algorithm for Differential File Comparison" paper;jmc2011-02-031-2/+10
| | | | | | diff originally from Daniel Dickman, but otto suggested this paper ok otto millert
* add an EXIT STATUS section for /usr/bin;jmc2010-09-031-4/+4
|
* Add a cross reference to patch(1)schwarze2010-08-181-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@
* `-q' is an output option, hence it is mutually exclusive.sobrado2010-02-211-9/+9
| | | | ok jmc@
* move mutually exclusive options (-c, -e, -f, -n and -u) to the right place.sobrado2009-11-091-4/+4
| | | | ok jmc@
* updates to IEEE Std 1003.1-2008;jmc2009-02-081-2/+2
|
* bump the posix reference in STANDARDS to IEEE Std 1003.1-2008, with a fewjmc2009-02-081-3/+3
| | | | updates to follow;
* convert to new .Dd format;jmc2007-05-311-2/+2
|
* - use a consistent text for STANDARDSjmc2007-05-301-3/+7
| | | | - note which options are extensions to POSIX
* sort options/synopsis/usage();jmc2007-03-011-46/+44
| | | | from Igor Sobrado
* - no need to escape thesejmc2006-05-051-4/+4
|
* +.Xr sdiff 1 ,jmc2005-12-271-1/+2
|
* clarify what -a does;jmc2005-01-061-2/+11
| | | | prod and ok deraadt@
* If the -L option is specified twice, use it for the second filenamemillert2004-12-091-2/+3
| | | | like GNU diff does. Adapted from a diff by YAMAMOTO Takashi
* Implement -I option: ignore changes matching a set of regexes. Fromotto2004-06-201-14/+35
| | | | | Jared Yanovich, with twists from millert@ and me. Testing by brad@, sturm@ and pval@. ok millert@
* POSIX specifies that in directory mode device special files andmillert2004-03-161-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@
* use new .St macro;jmc2004-01-251-2/+2
|
* Document -p option. ok jmc@otto2004-01-071-5/+11
|
* - move `-d' to comparison options, rather then output optionsjmc2003-09-181-6/+6
| | | | | | - note (again) that output options are mutually exclusive from Andy Isaacson (PR 3479)
* - add -P to SYNOPSISjmc2003-09-071-5/+5
| | | | | | | | | - remove "mutually exclusive" clause - -c produces 15 *'s, not a dozen - add -a to uage() - sync usage() with SYNOPSIS ok tedu@
* Start new sentence on a new line.otto2003-07-271-4/+4
| | | | ok jmc@
* - Use a heuristic to bound memory and cpu usage, at the cost ofotto2003-07-271-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@
* Fixed the "dot alone on a line" bug.millert2003-07-221-12/+1
|
* Bring FILES section up to date.millert2003-07-221-12/+6
|
* Implement the -L and -T options from GNU diff.millert2003-07-221-15/+27
|
* Add STANDARDS sectionmillert2003-07-211-1/+7
|
* Re-implement -l flag; diff -l now works correctly in non-directorymillert2003-07-091-6/+15
| | | | mode (like GNU diff).
* Add -q option from GNU diffmillert2003-07-061-6/+9
|
* Implement -P from GNU diff (like -N but only for files that are missingmillert2003-07-061-1/+7
| | | | from dir1).
* Some fairly major changes:millert2003-07-061-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@
* Kill non-standard -l option as discussed with tedu@millert2003-07-041-11/+1
|
* Kill diff -h, we don't use or want diffh. Discussed w/ tedu@millert2003-07-041-15/+3
|
* tweak;jmc2003-06-281-2/+2
| | | | ok tedu@
* -a to force ascii compare. ok millerttedu2003-06-271-6/+8
|
* Update with unidiff info and make FILES section fit reality.millert2003-06-261-24/+61
| | | | With input from jmc@
* cleanup;jmc2003-06-251-74/+89
| | | | ok deraadt@
* this can be 3 term; gwyllion@ace.ulyssis.orgderaadt2003-06-251-6/+2
|
* cleanup. ansi, headers, correct prototypes, some safer string andtedu2003-06-251-0/+1
| | | | | tempfile functions, whitespace, ... no functional improvements yet
* man page from 4.4lite2deraadt2003-06-251-110/+95
|
* 4.3reno diff. This is free because of the Caldera license. Nasty, but aderaadt2003-06-251-0/+402
place to start.