diff options
Diffstat (limited to 'misc/patchutils/pkg-descr')
| -rw-r--r-- | misc/patchutils/pkg-descr | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/misc/patchutils/pkg-descr b/misc/patchutils/pkg-descr index 02139c436821..4ad834d39aa5 100644 --- a/misc/patchutils/pkg-descr +++ b/misc/patchutils/pkg-descr @@ -1,13 +1,21 @@ Patchutils is a small collection of programs that operate on patch files. -Currently it contains interdiff and filterdiff. -Interdiff generates an incremental patch from two patches against a common -source. For example, if you have applied a pre-patch to a source tree, and -wish to apply another pre-patch (which is against the same original source -tree), you can use interdiff to generate the patch that you need to apply. -You can also use this to review changes between two pre-patches. - -Filterdiff will select the portions of a patch file that apply to files -matching (or, alternatively, not matching) a shell wildcard. + - Interdiff generates an incremental patch from two patches against a common + source. + - Combinediff generates a single patch from two incremental patches, allowing + you to merge patches together. + - Filterdiff will select the portions of a patch file that apply to files + matching (or, alternatively, not matching) a shell wildcard. + - Fixcvsdiff is for correcting the output of 'cvs diff'. + - Rediff corrects hand-edited patches, by comparing the original patch with + the modified one and adjusting the offsets and counts. + - Lsdiff displays a short listing of affected files in a patch file, along + with (optionally) the line numbers of the start of each patch. + - Splitdiff separates out patches from a patch file so that each new patch + file only alters any given file once. + - Grepdiff displays a list of the files modified by a patch where the patch + contains a given regular expression. + - Recountdiff fixes up counts and offsets in a unified diff. + - Unwrapdiff fixes word-wrapped unified diffs. WWW: http://cyberelk.net/tim/patchutils/ |