1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
.\"Generated by db2man.xsl. Don't modify this, modify the source.
.de Sh \" Subsection
.br
.if t .Sp
.ne 5
.PP
\fB\\$1\fR
.PP
..
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.de Ip \" List item
.br
.ie \\n(.$>=3 .ne \\$3
.el .ne 3
.IP "\\$1" \\$2
..
.TH "INTERDIFF" 1 "5 Mar 2002" "patchutils" ""
.SH NAME
interdiff \- show differences between two unified diff files
.SH "SYNOPSIS"
.nf
\fBinterdiff\fR [-p \fIn\fR] [-U \fIn\fR] [-d \fIPAT\fR] [-Bbiwz]
[--interpolate | --combine] \fIdiff1\fR \fIdiff2\fR
.fi
.nf
\fBinterdiff\fR {--help | --version}
.fi
.SH "DESCRIPTION"
.PP
interdiff creates a unified diff that expresses the difference between two unified diffs (patches created with the \fB-u\fR option to diff). The diffs must both be relative to the same files. For best results, the diffs must have at least three lines of context.
.PP
To reverse a patch, use \fI/dev/null\fR for \fIdiff2\fR.
.SH "OPTIONS"
.TP
\fB-h\fR
Ignored, for compatibility with older versions of interdiff. This option will go away soon.
.TP
\fB-p\fR \fIn\fR
When comparing filenames, ignore the first \fIn\fR pathname components from both patches. (This is similar to the \fB-p\fR option to GNU \fBpatch\fR(1).)
.TP
\fB-U\fR \fIn\fR
Attempt to display \fIn\fR lines of context (requires at least \fIn\fR lines of context in both input files). (This is similar to the \fB-U\fR option to GNU \fBdiff\fR(1).)
.TP
\fB-d\fR \fIpattern\fR
Don't display any context on files that match the shell wildcard \fIpattern\fR. This option can be given multiple times.
.TP
\fB-i\fR
Consider upper- and lower-case to be the same.
.TP
\fB-w\fR
Ignore whitespace changes in patches.
.TP
\fB-b\fR
Ignore changes in the amount of whitespace.
.TP
\fB-B\fR
Ignore changes whose lines are all blank.
.TP
\fB-z\fR
Decompress files with extensions .gz and .bz2.
.TP
\fB--interpolate\fR
Run as ``interdiff''. This is the default.
.TP
\fB--combine\fR
Run as ``combinediff''. See \fBcombinediff\fR(1) for more information about how the behaviour is altered in this mode.
.TP
\fB--help\fR
Display a short usage message.
.TP
\fB--version\fR
Display the version number of interdiff.
.SH "BUGS"
.PP
There are currently no known bugs in interdiff; but there are some caveats. If you find a bug, please report it (along with a minimal test case) to Tim Waugh <twaugh@redhat.com>.
.PP
The \fB-U\fR option is a bit erratic: it can control the amount of context displayed for files that are modified in both patches, but not for files that only appear in one patch (which appear with the same amount of context in the output as in the input). If you really want this changed, let me know.
.PP
There are some sets of patches in which there is just not enough information to produce a proper interdiff. In this case, the strategy employed is to revert the original patch and apply the new patch. This, unfortunately, means that interdiffs are not guaranteed to be reversible.
.SH "SEE ALSO"
.PP
\fBcombinediff\fR(1)
.SH AUTHOR
Tim Waugh <twaugh@redhat.com>.
.br
Man page edited by Michael K. Johnson <johnsonm@redhat.com>.
|
