creates a unified format diff that expresses the difference between two diffs. The diffs must both be relative to the same files. For best results, the diffs must have at least three lines of context.
To reverse a patch, use
To reduce the amount of context in a patch, use:
interdiff -U1 /dev/null patchfile
doesn't have the advantage of being able to look at the files that are to be modified, it has stricter requirements on the input format than
does. The output of GNU diff will be okay, even with extensions, but if you intend to use a hand-edited patch it might be wise to clean up the offsets and counts using
Note, however, that the two patches must both be relative to the versions of the same original set of files.
The diffs may be in context format. The output, however, will be in unified format.
Ignored, for compatibility with older versions of interdiff. This option will go away soon.
- -p n
When comparing filenames, ignore the first
pathname components from both patches. (This is similar to the
option to GNU
Quieter output. Don't emit rationale lines at the beginning of each patch.
- -U n
Attempt to display
lines of context (requires at least
lines of context in both input files). (This is similar to the
option to GNU
- -d pattern
Don't display any context on files that match the shell wildcard
pattern. This option can be given multiple times.
Note that the interpretation of the shell wildcard pattern does not count slash characters or periods as special (in other words, no flags are given to
fnmatch). This is so that
lq*/basenamerq-type patterns can be given without limiting the number of pathname components.
Consider upper- and lower-case to be the same.
Ignore whitespace changes in patches.
Ignore changes in the amount of whitespace.
Ignore changes whose lines are all blank.
Decompress files with extensions .gz and .bz2.
lqinterdiffrq. This is the default.
for more information about how the behaviour is altered in this mode.
(For interpolation mode only) When a file is changed by the first patch but not by the second, don't revert that change.
Display a short usage message.
Display the version number of interdiff.
interdiff -z 3.2pre1.patch.gz 3.2pre2.patch.gz
Reversing a patch:
interdiff patch /dev/null
Reversing part of a patch (and ignoring the rest):
filterdiff -i file.c patchfile | \
interdiff /dev/stdin /dev/null
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
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.
Tim Waugh <firstname.lastname@example.org>.
Michael K. Johnson <email@example.com>. (man page)
- SEE ALSO