[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.7 and 1.8

version 1.7, 2003/07/18 02:00:09 version 1.8, 2003/07/22 20:17:06
Line 61 
Line 61 
 patch - apply a diff file to an original  patch - apply a diff file to an original
 .SH SYNOPSIS  .SH SYNOPSIS
 .B patch  .B patch
 [options] [origfile [patchfile]] [+ [options] [origfile]]...  [options] [origfile [patchfile]]
 .sp  .sp
 but usually just  but usually just
 .sp  .sp
Line 216 
Line 216 
 and that the garbage before each diff listing will  and that the garbage before each diff listing will
 be examined for interesting things such as filenames and revision level, as  be examined for interesting things such as filenames and revision level, as
 mentioned previously.  mentioned previously.
 You can give switches (and another original file name) for the second and  
 subsequent patches by separating the corresponding argument lists  
 by a \*(L'+\*(R'.  
 (The argument list for a second or subsequent patch may not specify a new  
 patch file, however.)  
 .PP  .PP
 .I Patch  .I Patch
 recognizes the following switches:  recognizes the following switches:
Line 393 
Line 388 
 makes  makes
 .I patch  .I patch
 do its work silently, unless an error occurs.  do its work silently, unless an error occurs.
 .TP 5  
 .B \-S or \-\-skip  
 causes  
 .I patch  
 to ignore this patch from the patch file, but continue on looking  
 for the next patch in the file.  
 Thus  
 .sp  
         patch -S + -S + <patchfile  
 .sp  
 will ignore the first and second of three patches.  
 .TP 5  .TP 5
 .B \-u or \-\-unified  .B \-u or \-\-unified
 forces  forces
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8