diff options
Diffstat (limited to 'patch.man')
| -rw-r--r-- | patch.man | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -314,10 +314,6 @@ and patches should be generated by .B "diff\ \*=binary" when line endings are significant.) .TP -\fB\*=read\-only=\fP\fIbehavior\fP -Behave as requested when trying to modify a read-only file: \fBignore\fP the -potential problem, \fBwarn\fP about it (the default), or \fBfail\fP. -.TP \fB\-c\fP or \fB\*=context\fP Interpret the patch file as a ordinary context diff. .TP @@ -591,6 +587,10 @@ Luckily, most patches add or change lines rather than delete them, so most reversed normal diffs begin with a delete, which fails, triggering the heuristic.) .TP +\fB\*=read\-only=\fP\fIbehavior\fP +Behave as requested when trying to modify a read-only file: \fBignore\fP the +potential problem, \fBwarn\fP about it (the default), or \fBfail\fP. +.TP \fB\*=reject\-format=\fP\fIformat\fP Produce reject files in the specified \fIformat\fP (either \fBcontext\fP or \fBunified\fP). Without this option, rejected hunks come out in unified diff |