aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2017-03-23 04:35:52 +0000
committerEnji Cooper <ngie@FreeBSD.org>2017-03-23 04:35:52 +0000
commit7dacb9e765019feeaa1afd9a3714fc54d0145925 (patch)
treee5daa6b4267d78e04cfe978c948fe9a140b2d954 /usr.bin/diff
parent51c2814518ea8e50224c435ef80480cf3c7dee23 (diff)
Notes
Diffstat (limited to 'usr.bin/diff')
-rw-r--r--usr.bin/diff/diff.1100
1 files changed, 85 insertions, 15 deletions
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index 80c8110a0d879..7ec168283b9ef 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -43,45 +43,97 @@
.Fl c | e | f |
.Fl n | q | u
.Oc
+.Op Fl -brief
+.Op Fl -ed
+.Op Fl -expand-tabs
+.Op Fl -forward-ed
+.Op Fl -ignore-all-space
.Op Fl -ignore-case
+.Op Fl -ignore-space-change
+.Op Fl -initial-tab
+.Op Fl -minimal
.Op Fl -no-ignore-file-name-case
.Op Fl -normal
+.Op Fl -rcs
+.Op Fl -show-c-function
+.Op Fl -starting-file
.Op Fl -strip-trailing-cr
.Op Fl -tabsize
-.Op Fl I Ar pattern
-.Op Fl L Ar label
+.Op Fl -text
+.Op Fl -unified
+.Op Fl I Ar pattern | Fl -ignore-matching-lines Ar pattern
+.Op Fl L Ar label | Fl -label Ar label
.Ar file1 file2
.Nm diff
.Op Fl abdilpTtw
-.Op Fl I Ar pattern
-.Op Fl L Ar label
+.Op Fl I Ar pattern | Fl -ignore-matching-lines Ar pattern
+.Op Fl L Ar label | Fl -label Ar label
+.Op Fl -brief
+.Op Fl -ed
+.Op Fl -expand-tabs
+.Op Fl -forward-ed
+.Op Fl -ignore-all-space
.Op Fl -ignore-case
+.Op Fl -ignore-space-change
+.Op Fl -initial-tab
+.Op Fl -minimal
.Op Fl -no-ignore-file-name-case
.Op Fl -normal
+.Op Fl -paginate
+.Op Fl -rcs
+.Op Fl -show-c-function
+.Op Fl -starting-file
.Op Fl -strip-trailing-cr
.Op Fl -tabsize
-.Fl C Ar number
+.Op Fl -text
+.Fl C Ar number | -context Ar number
.Ar file1 file2
.Nm diff
.Op Fl abdiltw
-.Op Fl I Ar pattern
+.Op Fl I Ar pattern | Fl -ignore-matching-lines Ar pattern
+.Op Fl -brief
+.Op Fl -ed
+.Op Fl -expand-tabs
+.Op Fl -forward-ed
+.Op Fl -ignore-all-space
.Op Fl -ignore-case
+.Op Fl -ignore-space-change
+.Op Fl -initial-tab
+.Op Fl -minimal
.Op Fl -no-ignore-file-name-case
.Op Fl -normal
+.Op Fl -paginate
+.Op Fl -rcs
+.Op Fl -show-c-function
+.Op Fl -starting-file
.Op Fl -strip-trailing-cr
.Op Fl -tabsize
-.Fl D Ar string
+.Op Fl -text
+.Fl D Ar string | Fl -ifdef Ar string
.Ar file1 file2
.Nm diff
.Op Fl abdilpTtw
-.Op Fl I Ar pattern
-.Op Fl L Ar label
+.Op Fl I Ar pattern | Fl -ignore-matching-lines Ar pattern
+.Op Fl L Ar label | Fl -label Ar label
+.Op Fl -brief
+.Op Fl -ed
+.Op Fl -expand-tabs
+.Op Fl -forward-ed
+.Op Fl -ignore-all-space
.Op Fl -ignore-case
+.Op Fl -ignore-space-change
+.Op Fl -initial-tab
+.Op Fl -minimal
.Op Fl -no-ignore-file-name-case
.Op Fl -normal
+.Op Fl -paginate
+.Op Fl -rcs
+.Op Fl -show-c-function
+.Op Fl -starting-file
.Op Fl -strip-trailing-cr
.Op Fl -tabsize
-.Fl U Ar number
+.Op Fl -text
+.Fl U Ar number | Fl -unified Ar number
.Ar file1 file2
.Nm diff
.Op Fl abdilNPprsTtw
@@ -89,17 +141,35 @@
.Fl c | e | f |
.Fl n | q | u
.Oc
+.Op Fl -brief
+.Op Fl -context
+.Op Fl -ed
+.Op Fl -expand-tabs
+.Op Fl -forward-ed
+.Op Fl -ignore-all-space
.Op Fl -ignore-case
+.Op Fl -ignore-space-change
+.Op Fl -initial-tab
+.Op Fl -minimal
+.Op Fl -new-file
.Op Fl -no-ignore-file-name-case
.Op Fl -normal
+.Op Fl -paginate
+.Op Fl -rcs
+.Op Fl -recursive
+.Op Fl -report-identical-files
+.Op Fl -show-c-function
.Op Fl -strip-trailing-cr
.Op Fl -tabsize
-.Op Fl I Ar pattern
+.Op Fl -text
+.Op Fl -unidirectional-new-file
+.Op Fl -unified
+.Op Fl I Ar pattern | Fl -ignore-matching-lines Ar pattern
.Bk -words
-.Op Fl L Ar label
-.Op Fl S Ar name
-.Op Fl X Ar file
-.Op Fl x Ar pattern
+.Op Fl L Ar label | Fl -label Ar label
+.Op Fl S Ar name | Fl -starting-file Ar name
+.Op Fl X Ar file | Fl -exclude-from Ar file
+.Op Fl x Ar pattern | Fl -exclude Ar pattern
.Ek
.Ar dir1 dir2
.Sh DESCRIPTION