1COMBINEDIFF(1) Man pages COMBINEDIFF(1)
2
6 combinediff - create a cumulative unified patch from two incremental
7 patches
8
10 combinediff [[-p n] | [--strip-match=n]] [[-U n] | [--unified=n]]
11 [[-d PAT] | [--drop-context=PAT]] [[-q] | [--quiet]] [[-z]
12 | [--decompress]] [[-b] | [--ignore-space-change]] [[-B] |
13 [--ignore-blank-lines]] [[-i] | [--ignore-case]] [[-w] |
14 [--ignore-all-space]] [[--interpolate] | [--combine]] diff1
15 diff2
16 combinediff {[--help] | [--version]}
18
20 combinediff creates a unified diff that expresses the sum of two diffs.
21 The diff files must be listed in the order that they are to be applied.
22 For best results, the diffs must have at least three lines of context.
23 Since combinediff doesn't have the advantage of being able to look at
25 the files that are to be modified, it has stricter requirements on the
26 input format than patch(1) does. The output of GNU diff will be okay,
27 even with extensions, but if you intend to use a hand-edited patch it
28 might be wise to clean up the offsets and counts using recountdiff(1)
29 first.
30 Note, however, that the two patches must be in strict incremental
32 order. In other words, the second patch must be relative to the state
33 of the original set of files after the first patch was applied.
34 The diffs may be in context format. The output, however, will be in
36 unified format.
37
39 -p n, --strip-match=n
40 When comparing filenames, ignore the first n pathname components
41 from both patches. (This is similar to the -p option to GNU
42 patch(1).)
43 -q, --quiet
45 Quieter output. Don't emit rationale lines at the beginning of each
46 patch.
47 -U n, --unified=n
49 Attempt to display n lines of context (requires at least n lines of
50 context in both input files). (This is similar to the -U option to
51 GNU diff(1).)
52 -d pattern, --drop-context=PATTERN
54 Don't display any context on files that match the shell wildcard
55 pattern. This option can be given multiple times.
56 Note that the interpretation of the shell wildcard pattern does not
58 count slash characters or periods as special (in other words, no
59 flags are given to fnmatch). This is so that “*/basename”-type
60 patterns can be given without limiting the number of pathname
61 components.
62 -i, --ignore-case
64 Consider upper- and lower-case to be the same.
65 -w, --ignore-all-space
67 Ignore whitespace changes in patches.
68 -b, --ignore-space-change
70 Ignore changes in the amount of whitespace.
71 -B, --ignore-blank-lines
73 Ignore changes whose lines are all blank.
74 -z, --decompress
76 Decompress files with extensions .gz and .bz2.
77 --interpolate
79 Run as “interdiff”. See interdiff(1) for more information about how
80 the behaviour is altered in this mode.
81 --combine
83 Run as “combinediff”. This is the default.
84 --help
86 Display a short usage message.
87 --version
89 Display the version number of combinediff.
90
92 The -U option is a bit erratic: it can control the amount of context
93 displayed for files that are modified in both patches, but not for
94 files that only appear in one patch (which appear with the same amount
95 of context in the output as in the input).
96
98 interdiff(1)
99
101 Tim Waugh <twaugh@redhat.com>
102 Package maintainer
103patchutils 23 Jan 2009 COMBINEDIFF(1)