From 20ee132cae47f48ea0138d14ed2876ad7a57b88c Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 26 Nov 1999 02:51:44 +0000
Subject: * 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.

---
 gnu/usr.bin/diff/diff.1 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'gnu/usr.bin/diff/diff.1')

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
-- 
cgit v1.2.3