aboutsummaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff/diff.1
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>1999-11-26 02:51:44 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>1999-11-26 02:51:44 +0000
commit20ee132cae47f48ea0138d14ed2876ad7a57b88c (patch)
tree30009de03e4e2f2cee3891ddbdb4343435fb3fd2 /gnu/usr.bin/diff/diff.1
parentdda0e6f54e783851845bbdb86d5a314837e0c59a (diff)
Notes
Diffstat (limited to 'gnu/usr.bin/diff/diff.1')
-rw-r--r--gnu/usr.bin/diff/diff.112
1 files changed, 12 insertions, 0 deletions
diff --git a/gnu/usr.bin/diff/diff.1 b/gnu/usr.bin/diff/diff.1
index d08333349a47..cbad443f519a 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