[BACK]Return to patch.1 CVS log [TXT][DIR] Up to [local] / src / usr.bin / patch

Diff for /src/usr.bin/patch/patch.1 between version 1.1 and 1.2

version 1.1, 1995/10/18 08:45:55 version 1.2, 1996/06/10 11:21:30
Line 1 
Line 1 
 .\"     $Id$    -*- nroff -*-  .\"     $OpenBSD$       -*- nroff -*-
 .rn '' }`  .rn '' }`
 .de Sh  .de Sh
 .br  .br
Line 205 
Line 205 
 .I Patch  .I Patch
 recognizes the following switches:  recognizes the following switches:
 .TP 5  .TP 5
 .B \-b  .B \-b or \-\-suffix
 causes the next argument to be interpreted as the backup extension, to be  causes the next argument to be interpreted as the backup extension, to be
 used in place of \*(L".orig\*(R" or \*(L"~\*(R".  used in place of \*(L".orig\*(R" or \*(L"~\*(R".
 .TP 5  .TP 5
 .B \-B  .B \-B or \-\-prefix
 causes the next argument to be interpreted as a prefix to the backup file  causes the next argument to be interpreted as a prefix to the backup file
 name. If this argument is specified any argument from -b will be ignored.  name. If this argument is specified any argument from -b will be ignored.
 .TP 5  .TP 5
 .B \-c  .B \-c or \-\-context
 forces  forces
 .I patch  .I patch
 to interpret the patch file as a context diff.  to interpret the patch file as a context diff.
 .TP 5  .TP 5
 .B \-d  .B \-d or \-\-directory
 causes  causes
 .I patch  .I patch
 to interpret the next argument as a directory, and cd to it before doing  to interpret the next argument as a directory, and cd to it before doing
 anything else.  anything else.
 .TP 5  .TP 5
 .B \-D  .B \-D or \-\-ifdef
 causes  causes
 .I patch  .I patch
 to use the "#ifdef...#endif" construct to mark changes.  to use the "#ifdef...#endif" construct to mark changes.
Line 233 
Line 233 
 .B \-D  .B \-D
 and the argument.  and the argument.
 .TP 5  .TP 5
 .B \-e  .B \-e or \-\-ed
 forces  forces
 .I patch  .I patch
 to interpret the patch file as an ed script.  to interpret the patch file as an ed script.
 .TP 5  .TP 5
 .B \-E  .B \-E or \-\-remove-empty-files
 causes  causes
 .I patch  .I patch
 to remove output files that are empty after the patches have been applied.  to remove output files that are empty after the patches have been applied.
 .TP 5  .TP 5
 .B \-f  .B \-f or \-\-force
 forces  forces
 .I patch  .I patch
 to assume that the user knows exactly what he or she is doing, and to not  to assume that the user knows exactly what he or she is doing, and to not
Line 255 
Line 255 
 .B \-s  .B \-s
 for that.  for that.
 .TP 5  .TP 5
 .B \-t  .B \-t or \-\-batch
 similar to  similar to
 .BR \-f ,  .BR \-f ,
 in that it suppresses questions, but makes some different assumptions:  in that it suppresses questions, but makes some different assumptions:
Line 264 
Line 264 
 in the patch; and assume that patches are reversed if they look like  in the patch; and assume that patches are reversed if they look like
 they are.  they are.
 .TP 5  .TP 5
 .B \-F<number>  .B \-F<number> or \-\-fuzz <number>
 sets the maximum fuzz factor.  sets the maximum fuzz factor.
 This switch only applies to context diffs, and causes  This switch only applies to context diffs, and causes
 .I patch  .I patch
Line 273 
Line 273 
 The default fuzz factor is 2, and it may not be set to more than  The default fuzz factor is 2, and it may not be set to more than
 the number of lines of context in the context diff, ordinarily 3.  the number of lines of context in the context diff, ordinarily 3.
 .TP 5  .TP 5
 .B \-l  .B \-l or \-\-ignore-whitespace
 causes the pattern matching to be done loosely, in case the tabs and  causes the pattern matching to be done loosely, in case the tabs and
 spaces have been munged in your input file.  spaces have been munged in your input file.
 Any sequence of whitespace in the pattern line will match any sequence  Any sequence of whitespace in the pattern line will match any sequence
Line 281 
Line 281 
 Normal characters must still match exactly.  Normal characters must still match exactly.
 Each line of the context must still match a line in the input file.  Each line of the context must still match a line in the input file.
 .TP 5  .TP 5
 .B \-n  .B \-n or \-\-normal
 forces  forces
 .I patch  .I patch
 to interpret the patch file as a normal diff.  to interpret the patch file as a normal diff.
 .TP 5  .TP 5
 .B \-N  .B \-N or \-\-forward
 causes  causes
 .I patch  .I patch
 to ignore patches that it thinks are reversed or already applied.  to ignore patches that it thinks are reversed or already applied.
 See also  See also
 .B \-R .  .B \-R .
 .TP 5  .TP 5
 .B \-o  .B \-o or \-\-output
 causes the next argument to be interpreted as the output file name.  causes the next argument to be interpreted as the output file name.
 .TP 5  .TP 5
 .B \-p<number>  .B \-p<number> or \-\-strip <number>
 sets the pathname strip count,  sets the pathname strip count,
 which controls how pathnames found in the patch file are treated, in case  which controls how pathnames found in the patch file are treated, in case
 the you keep your files in a different directory than the person who sent  the you keep your files in a different directory than the person who sent
Line 334 
Line 334 
 .B \-d  .B \-d
 switch.  switch.
 .TP 5  .TP 5
 .B \-r  .B \-r or \-\-reject-file
 causes the next argument to be interpreted as the reject file name.  causes the next argument to be interpreted as the reject file name.
 .TP 5  .TP 5
 .B \-R  .B \-R or \-\-reverse
 tells  tells
 .I patch  .I patch
 that this patch was created with the old and new files swapped.  that this patch was created with the old and new files swapped.
Line 366 
Line 366 
 reversed normal diffs will begin with a delete, which will fail, triggering  reversed normal diffs will begin with a delete, which will fail, triggering
 the heuristic.)  the heuristic.)
 .TP 5  .TP 5
 .B \-s  .B \-s or \-\-quiet or \-\-silent
 makes  makes
 .I patch  .I patch
 do its work silently, unless an error occurs.  do its work silently, unless an error occurs.
 .TP 5  .TP 5
 .B \-S  .B \-S or \-\-skip
 causes  causes
 .I patch  .I patch
 to ignore this patch from the patch file, but continue on looking  to ignore this patch from the patch file, but continue on looking
Line 382 
Line 382 
 .sp  .sp
 will ignore the first and second of three patches.  will ignore the first and second of three patches.
 .TP 5  .TP 5
 .B \-u  .B \-u or \-\-unified
 forces  forces
 .I patch  .I patch
 to interpret the patch file as a unified context diff (a unidiff).  to interpret the patch file as a unified context diff (a unidiff).
 .TP 5  .TP 5
 .B \-v  .B \-v or \-\-version
 causes  causes
 .I patch  .I patch
 to print out its revision header and patch level.  to print out its revision header and patch level.
 .TP 5  .TP 5
 .B \-V  .B \-V or \-\-version-control
 causes the next argument to be interpreted as a method for creating  causes the next argument to be interpreted as a method for creating
 backup file names.  The type of backups made can also be given in the  backup file names.  The type of backups made can also be given in the
 .B VERSION_CONTROL  .B VERSION_CONTROL
Line 423 
Line 423 
 Always make simple backups.  Always make simple backups.
 .RE  .RE
 .TP 5  .TP 5
 .B \-x<number>  .B \-x<number> or \-\-debug <number>
 sets internal debugging flags, and is of interest only to  sets internal debugging flags, and is of interest only to
 .I patch  .I patch
 patchers.  patchers.
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2