upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

diff: Document the --no-dereference option.

Browse source 
Also, --no-dereference should not imply --recurse.

MFC after:	3 days
Sponsored by:	Klara, Inc.
Reviewed by:	allanjude
Differential Revision:	https://reviews.freebsd.org/D45779

(cherry picked from commit 4ce4a0fe14)
This commit is contained in:
Dag-Erling Smørgrav 2024-06-30 17:55:27 +02:00
parent 8daa609450
commit 16a753759e
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usr.bin/diff/diff.1
View file

@ -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

1
usr.bin/diff/diff.c
View file

@ -336,7 +336,6 @@ main(int argc, char **argv)
optarg);
break;
case OPT_NO_DEREFERENCE:
rflag = true;
noderef = true;
break;
case OPT_VERSION: