diff options
Diffstat (limited to 'patch.man')
| -rw-r--r-- | patch.man | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -356,8 +356,8 @@ removes a file, it also attempts to remove any empty ancestor directories. \fB\-f\fP or \fB\*=force\fP Assume that the user knows exactly what he or she is doing, and do not ask any questions. Skip patches whose headers -do not say which file is to be patched; patch files even though they are -read-only or have the wrong version for the +do not say which file is to be patched; patch files even though they have the +wrong version for the .B Prereq:\& line in the patch; and assume that patches are not reversed even if they look like they are. @@ -587,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 @@ -596,6 +600,13 @@ diff form. \fB\-s\fP or \fB\*=silent\fP or \fB\*=quiet\fP Work silently, unless an error occurs. .TP +\fB\*=follow\-symlinks\fP +When looking for input files, follow symbolic links. Replaces the symbolic +links, instead of modifying the files the symbolic links point to. Git-style +patches to symbolic links will no longer apply. This option exists for +backwards compatibility with previous versions of patch; its use is +discouraged. +.TP \fB\-t\fP or \fB\*=batch\fP Suppress questions like .BR \-f , |