diff options
author | obrien <obrien@FreeBSD.org> | 1999-11-26 02:51:44 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 1999-11-26 02:51:44 +0000 |
commit | 46689ca7f0002e4deea37db960b95e14958d50cb (patch) | |
tree | 04d91218be61c3eaa96b304ba8cc96605bcb6f4d /gnu | |
parent | d0da4e010d8ed65bf5f7db99a1b113baee7bf5fa (diff) | |
download | FreeBSD-src-46689ca7f0002e4deea37db960b95e14958d50cb.zip FreeBSD-src-46689ca7f0002e4deea37db960b95e14958d50cb.tar.gz |
* Support the environtmental var "DIFF_OPTIONS". Which can hold a set of
default options for diff. These options are interpreted first and can be
overwritten by explicit command line parameters.
* Add the "-o" option to specify old-traditional output style.
* Add utility functions for env vars obtained from GNU Grep 2.3h.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/usr.bin/diff/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/diff/diff.1 | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile index 75d8c48..58818cb 100644 --- a/gnu/usr.bin/diff/Makefile +++ b/gnu/usr.bin/diff/Makefile @@ -4,7 +4,7 @@ PROG= diff SRCS= diff.c analyze.c io.c context.c ed.c normal.c ifdef.c util.c dir.c \ - version.c getopt.c getopt1.c side.c cmpbuf.c + version.c getopt.c getopt1.c side.c cmpbuf.c prepend_args.c # Important for ctype macros! CFLAGS+=-funsigned-char diff --git a/gnu/usr.bin/diff/diff.1 b/gnu/usr.bin/diff/diff.1 index d083333..cbad443 100644 --- a/gnu/usr.bin/diff/diff.1 +++ b/gnu/usr.bin/diff/diff.1 @@ -1,3 +1,4 @@ +.\" $FreeBSD$ .TH DIFF 1 "22sep1993" "GNU Tools" "GNU Tools" .SH NAME diff \- find differences between two files @@ -297,6 +298,9 @@ Use to output a line taken from just the second file in if-then-else format. .TP +.B \-o +Use the old traditional output format. +.TP .BI \-\-old\-group\-format= format Use .I format @@ -463,6 +467,14 @@ match any pattern contained in .TP .B \-y Use the side by side output format. +.SH ENVIRONMENT +The environment variable +.B DIFF_OPTIONS +can hold a set of default +options for +.I diff. +These options are interpreted first and can be overwritten by explicit command +line parameters. .SH EXAMPLES To save to a file some changes that you have made to your local source tree (possibly including new files), which you would like to show to others |