1REDIFF(1) Man pages REDIFF(1)
2
3
4
6 rediff, editdiff - fix offsets and counts of a hand-edited diff
7
9 rediff ORIGINAL EDITED
10
11 rediff EDITED
12
13 rediff {[--help] | [--version]}
14
15 editdiff FILE
16
17 editdiff {[--help] | [--version]}
18
20 You can use rediff to correct a hand-edited unified diff. Take a copy
21 of the diff you want to edit, and edit it without changing any offsets
22 or counts (the lines that begin “@@”). Then run rediff, telling it the
23 name of the original diff file and the name of the one you have edited,
24 and it will output the edited diff file but with corrected offsets and
25 counts.
26
27 A small script, editdiff, is provided for editing a diff file in-place.
28
29 The types of changes that are currently handled are:
30
31 · Modifying the text of any file content line (of course).
32
33 · Adding new line insertions or deletions.
34
35 · Adding, changing or removing context lines. Lines at the context
36 horizon are dealt with by adjusting the offset and/or count.
37
38 · Adding a single hunk (@@-prefixed section).
39
40 · Removing multiple hunk (@@-prefixed sections).
41
42 Alternatively, if only one argument is provided, it is taken to be the
43 edited file and the counts and offsets are adjusted as appropriate.
44 Some assumptions are made when used in this mode. See recountdiff(1)
45 for more information.
46
48 --help
49 Display a short usage message.
50
51 --version
52 Display the version number of rediff.
53
55 interdiff(1), recountdiff(1)
56
58 Tim Waugh <twaugh@redhat.com>
59 Package maintainer
60
61
62
63patchutils 13 May 2002 REDIFF(1)