aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2024-06-30 15:55:27 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2024-07-04 15:31:09 +0000
commit16a753759e482c8091b195514d50bc94ae501ccf (patch)
treee4695be1dbab07d0a6666cf7b8d82dbe041def0a /usr.bin/diff
parent8daa60945080c602f2a65ed2a0f2333c15bd947e (diff)
Diffstat (limited to 'usr.bin/diff')
-rw-r--r--usr.bin/diff/diff.110
-rw-r--r--usr.bin/diff/diff.c1
2 files changed, 9 insertions, 2 deletions
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index d3978158d1d1..c10b130a2d72 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -29,7 +29,7 @@
.\"
.\" @(#)diff.1 8.1 (Berkeley) 6/30/93
.\"
-.Dd February 26, 2024
+.Dd June 29, 2024
.Dt DIFF 1
.Os
.Sh NAME
@@ -53,6 +53,7 @@
.Op Fl -ignore-space-change
.Op Fl -initial-tab
.Op Fl -minimal
+.Op Fl -no-dereference
.Op Fl -no-ignore-file-name-case
.Op Fl -normal
.Op Fl -rcs
@@ -83,6 +84,7 @@
.Op Fl -ignore-space-change
.Op Fl -initial-tab
.Op Fl -minimal
+.Op Fl -no-dereference
.Op Fl -no-ignore-file-name-case
.Op Fl -normal
.Op Fl -paginate
@@ -109,6 +111,7 @@
.Op Fl -ignore-space-change
.Op Fl -initial-tab
.Op Fl -minimal
+.Op Fl -no-dereference
.Op Fl -no-ignore-file-name-case
.Op Fl -normal
.Op Fl -paginate
@@ -137,6 +140,7 @@
.Op Fl -ignore-space-change
.Op Fl -initial-tab
.Op Fl -minimal
+.Op Fl -no-dereference
.Op Fl -no-ignore-file-name-case
.Op Fl -normal
.Op Fl -paginate
@@ -168,6 +172,7 @@
.Op Fl -initial-tab
.Op Fl -minimal
.Op Fl -new-file
+.Op Fl -no-dereference
.Op Fl -no-ignore-file-name-case
.Op Fl -normal
.Op Fl -paginate
@@ -198,6 +203,7 @@
.Op Fl -ignore-blank-lines
.Op Fl -ignore-case
.Op Fl -minimal
+.Op Fl -no-dereference
.Op Fl -no-ignore-file-name-case
.Op Fl -strip-trailing-cr
.Op Fl -suppress-common-lines
@@ -450,6 +456,8 @@ lines from FILE2
.El
.It Fl -ignore-file-name-case
ignore case when comparing file names
+.It Fl -no-dereference
+do not follow symbolic links
.It Fl -no-ignore-file-name-case
do not ignore case wen comparing file names (default)
.It Fl -normal
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
index d947c1e01705..24e851ae9dbf 100644
--- a/usr.bin/diff/diff.c
+++ b/usr.bin/diff/diff.c
@@ -336,7 +336,6 @@ main(int argc, char **argv)
optarg);
break;
case OPT_NO_DEREFERENCE:
- rflag = true;
noderef = true;
break;
case OPT_VERSION: