Lines Matching +full:normal +full:-

1 .\"-
31 .Bk -words
33 .Op Fl B Ar backup-prefix
36 .Op Fl F Ar max-fuzz
38 .Op Fl o Ar out-file
39 .Op Fl p Ar strip-count
40 .Op Fl r Ar rej-name
43 .Op Fl z Ar backup-ext
68 Context diffs (old-style, new-style, and unified) and
69 normal diffs are applied directly by the
88 .Bl -tag -width Ds
90 .Fl B Ar backup-prefix ,
91 .Fl Fl prefix Ar backup-prefix
107 .Fl -posix
109 .It Fl C , Fl Fl check , Fl Fl dry-run
136 .It Fl E , Fl Fl remove-empty-files
148 .Fl F Ar max-fuzz ,
149 .Fl Fl fuzz Ar max-fuzz
179 .It Fl l , Fl Fl ignore-whitespace
184 Normal characters must still match exactly.
192 .It Fl n , Fl Fl normal
195 to interpret the patch file as a normal diff.
197 .Fl o Ar out-file ,
198 .Fl Fl output Ar out-file
202 .Fl p Ar strip-count ,
203 .Fl Fl strip Ar strip-count
264 (Note: this method cannot detect a reversed patch if it is a normal diff
269 reversed normal diffs will begin with a delete, which will fail, triggering
272 .Fl r Ar rej-name ,
273 .Fl Fl reject-file Ar rej-name
299 .Fl Fl version-control Cm t | nil | never | none
319 .Dq version-control
322 .Bl -tag -width Ds -offset indent
345 .Fl z Ar backup-ext ,
346 .Fl Fl suffix Ar backup-ext
353 .St -p1003.1-2008
355 .Bl -enum
376 With context diffs, and to a lesser extent with normal diffs,
403 input patch was a context diff or a normal diff.
404 If the input was a normal diff, many of the contexts will simply be null.)
442 .Qq --- .
446 .Qq ---
462 .Bl -enum
467 .St -p1003.1-2008
480 file names or, for a non-context diff, the
507 .Dl | patch -d /usr/src/local/blurfl
573 .Bl -tag -width "PATCH_VERSION_CONTROL" -compact
593 .Bl -tag -width "$TMPDIR/patch*" -compact
607 .Bl -tag -width Ds -offset indent -compact
635 .St -p1003.1-2008
638 .Fl -posix
644 .Op Fl -posix
652 bad line numbers in a normal diff when it finds a
690 will think it is a reversed patch, and offer to un-apply the patch.