3
@@ -527,7 +527,7 @@ static char const shortopts[] = "bB:cd:D
4
#if 0 && defined(ENABLE_MERGE)
7
- "nNo:p:r:RstTuvV:x:Y:z:Z";
8
+ "nNo:p:r:RstTuUvV:x:Y:z:Z";
10
static struct option const longopts[] =
12
@@ -551,6 +551,7 @@ static struct option const longopts[] =
13
{"output", required_argument, NULL, 'o'},
14
{"strip", required_argument, NULL, 'p'},
15
{"reject-file", required_argument, NULL, 'r'},
16
+ {"global-reject-file", required_argument, NULL, 'r'}, /* Debian etch/lenny compatibility */
17
{"reverse", no_argument, NULL, 'R'},
18
{"quiet", no_argument, NULL, 's'},
19
{"silent", no_argument, NULL, 's'},
20
@@ -572,6 +573,7 @@ static struct option const longopts[] =
21
{"posix", no_argument, NULL, CHAR_MAX + 7},
22
{"quoting-style", required_argument, NULL, CHAR_MAX + 8},
23
{"reject-format", required_argument, NULL, CHAR_MAX + 9},
24
+ {"unified-reject-files", no_argument, NULL, 'U'}, /* Debian etch/lenny compatibility */
25
{NULL, no_argument, NULL, 0}
28
@@ -771,6 +773,9 @@ get_some_switches (void)
32
+ case 'U': /* Debian etch/lenny compatibility */
33
+ reject_format = UNI_DIFF;
40
@@ -550,6 +550,11 @@ instead of the default
42
file. When \fIrejectfile\fP is \fB\-\fP, discard rejects.
44
+.BI \*=global\-reject\-file= rejectfile
46
+\fB\*=reject\-file=\fP\fIrejectfile\fP. This option is deprecated and is a
47
+Debian-specific extension that will be removed in a future release.
49
\fB\-R\fP or \fB\*=reverse\fP
50
Assume that this patch was created with the old and new files swapped.
51
(Yes, I'm afraid that does happen occasionally, human nature being what it
52
@@ -585,6 +590,14 @@ Produce reject files in the specified \f
53
format if the input patch was of that format, otherwise in ordinary context
56
+\fB\-U\fP or \fB\*=unified\-reject\-files\fP
57
+Produce unified reject files.
59
+This option is deprecated and is a Debian-specific extension that will be
60
+removed in a future release. Use
61
+\fB\*=reject\-format=\fP\fIformat\fP
64
\fB\-s\fP or \fB\*=silent\fP or \fB\*=quiet\fP
65
Work silently, unless an error occurs.