24 Commits

Author SHA1 Message Date
Andreas Gruenbacher
7f5e5b5ec1 Fix typo in patch.man (reported by Vytautas Šaltenis) 2009-10-27 16:38:02 +01:00
Andreas Gruenbacher
62d03acb14 The -m option hasn't been officially allocated yet; use only the long form for now (--merge) 2009-07-19 17:50:54 +02:00
Vincent Legoll
b008dece18 Change the default value of PATCH_GET to 0
Patch should default to not try to get files from revision control software
unless actively asked by the user with the "-g" or "--get" command-line
switches, or the PATCH_GET environment variable.

Make the posixly correct behaviour of not using source control, the global
patch default. I.e. default to "-g0".

This is related to debian BTS bug: #200895
Please refer to that discussion for more background
information and discussion.
2009-05-12 14:32:15 +02:00
Andreas Gruenbacher
2e583114c7 Add support for sending output to standard output 2009-04-08 06:23:11 +02:00
Andreas Gruenbacher
aba1379506 Improve the description of --binary in patch.man 2009-04-07 13:58:07 +02:00
Andreas Gruenbacher
fea737a1b5 Document that merging can be slow 2009-04-05 23:46:02 +02:00
Andreas Gruenbacher
a03f22893c Copyright notice updates 2009-04-05 21:12:30 +02:00
Andreas Gruenbacher
802b26e78d Revert (almost) to the original asymmetric hunk behavior and document that 2009-04-05 20:24:04 +02:00
Andreas Gruenbacher
a3b6c4bbe6 Update the NEWS file 2009-04-03 11:18:47 +02:00
Andreas Gruenbacher
863fbb0459 Update patch.man 2009-04-03 10:58:44 +02:00
Andreas Gruenbacher
8a3f4d70e4 Enforce simple backup mode and compute the backup file name if -B, -Y, or -z is used
This fixes the case where -B or -Y is combined with -z (bug 25968).
2009-03-28 16:50:09 +01:00
Andreas Gruenbacher
9928568691 Remove obsolete RCS $Id$ tags 2009-03-22 13:40:03 +01:00
Andreas Gruenbacher
b7687446d1 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.
2009-03-22 13:39:46 +01:00
Andreas Gruenbacher
a1bdf4a383 Man page: Use plain asterisk instead of \[**] (asteriskmath)
(Found in the Debian package.)
2009-03-22 13:39:17 +01:00
Andreas Gruenbacher
b80bfda68f Make "patch -r rejfile" work even when there are several rejects
With a patch that includes rejects in more than one file and with the -r
option, rejects would overwrite themselves and only the rejects from
the last file would remain.  Fix this.
2009-03-22 13:39:09 +01:00
Andreas Gruenbacher
0a22c10196 Add unified reject format and the --reject-format=FORMAT option 2009-03-22 13:38:46 +01:00
Andreas Gruenbacher
712cce6fdd Import of patch-2.5.7.tar.gz 2009-03-17 21:43:20 +01:00
Andreas Gruenbacher
79159942f1 Import of patch-2.5.4.tar.gz 2009-03-12 15:17:49 +01:00
Andreas Gruenbacher
957f7b6423 Import of patch-2.5.3.tar.gz 2009-03-12 15:17:03 +01:00
Andreas Gruenbacher
6b2b462038 Import of patch-2.5.tar.gz 2009-03-12 15:15:49 +01:00
Andreas Gruenbacher
6263c220df Import of patch-2.4.tar.gz 2009-03-12 15:15:17 +01:00
Andreas Gruenbacher
1adb4535a3 Import of patch-2.3.tar.gz 2009-03-12 15:14:29 +01:00
Andreas Gruenbacher
bcce123390 Import of patch-2.2.tar.gz 2009-03-12 15:13:11 +01:00
Andreas Gruenbacher
068f401ee3 Import of patch-2.1.tar.gz 2009-03-12 15:09:25 +01:00