diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2009-03-15 20:58:54 +0100 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2009-03-22 13:39:46 +0100 |
commit | b7687446d1e7673a39fd66bc6043f4a78961f675 (patch) | |
tree | d40e1a6c0cb71dbd5b9674077529877a1ed8a913 /patch.man | |
parent | 6f399f7548a73ce60b7e34ced5c79c7472a3fdbc (diff) | |
download | patch-b7687446d1e7673a39fd66bc6043f4a78961f675.tar.gz |
Disable trailing CR stripping with --binary
Patch recognizes patches that have had their line endings converted
to CRLF and automatically strips CRs in that case. This generally is
the desired behavior, but if both the patch and the file(s) being patched have
CRLF line endings, patches that would apply without this heuristic will fail.
Modify the --binary option to disable the trailing CR stripping heuristic.
Diffstat (limited to 'patch.man')
-rw-r--r-- | patch.man | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -292,13 +292,15 @@ is .BR /junk/src/patch/util.c . .TP \fB\*=binary\fP -Read and write all files in binary mode, -except for standard output and +Write all files in binary mode, except for standard output and .BR /dev/tty . -This option has no effect on \s-1POSIX\s0-conforming systems. -On systems like \s-1DOS\s0 where this option makes a difference, -the patch should be generated by -.BR "diff\ \-a\ \*=binary" . +When reading, disable the heuristic for transforming CRLF line endings into LF +line endings. +(On \s-1POSIX\s0-conforming systems, reads and writes never transform line +endings. On systems like \s-1DOS\s0, reads and writed do transform line +endings by default, and patches should be generated by +.B "diff\ \*=binary" +when line endings are significant.) .TP \fB\-c\fP or \fB\*=context\fP Interpret the patch file as a ordinary context diff. |