rediff, editdiff − fix offsets and counts of a hand−edited diff



rediff EDITED

rediff {[−−help] | [−−version]}

editdiff FILE

editdiff {[−−help] | [−−version]}


You can use rediff to correct a hand−edited unified diff. Take a copy of the diff you want to edit, and edit it without changing any offsets or counts (the lines that begin “@@”). Then run rediff, telling it the name of the original diff file and the name of the one you have edited, and it will output the edited diff file but with corrected offsets and counts.

A small script, editdiff, is provided for editing a diff file in−place.

The types of changes that are currently handled are:

• Modifying the text of any file content line (of course).

• Adding new line insertions or deletions.

• Adding, changing or removing context lines. Lines at the context horizon are dealt with by adjusting the offset and/or count.

• Adding a single hunk (@@−prefixed section).

• Removing multiple hunk (@@−prefixed sections).

Alternatively, if only one argument is provided, it is taken to be the edited file and the counts and offsets are adjusted as appropriate. Some assumptions are made when used in this mode. See recountdiff(1) for more information.



Display a short usage message.


Display the version number of rediff.


interdiff(1), recountdiff(1)


Tim Waugh <>

Package maintainer

More Linux Commands

notepad(1) - Wine text editor (Commands - Linux man page)...
notepad is the Wine text editor, designed to be compatible with its Microsoft Windows counterpart. It supports ANSI, UTF-8 and UTF-16 files, and can read (but n

btrfsck(8) check or repair a btrfs filesystem offline.......
btrfs check is used to check or repair a btrfs filesystem offline. Note Since btrfs is under heavy development especially the btrfs check command, it is highly

threads(3pm) - Perl interpreter-based threads (Man Page)....
Since Perl 5.8, thread programming has been available using a model called interpreter threads which provides a new Perl interpreter for each thread, and, by de

ypwhich(1) - return name of NIS server or map master........
ypwhich returns the name of the NIS server that supplies the NIS services to a NIS client, or which is the master for a map. If invoked without arguments, it gi

item_visible(3menu) - check visibility of a menu item.......
A menu item is visible when it is in the portion of a posted menu that is mapped onto the screen (if the menu is scrollable, in particular, this portion will be

scope(n) - capture the namespace context for a variable.....
Creates a scoped value for the specified name, which must be a variable name. If the name is an instance variable, then the scope command returns a string of th

vlimit(3) - get/set resource limits - Linux manual page.....
The getrlimit() and setrlimit() system calls get and set resource limits respectively. Each resource has an associated soft and hard limit, as defined by the rl

Tk_PointToChar(3) - routines to measure and display single-f
These routines are for measuring and displaying single-font, multi-line, justified text. To measure and display simple single-font, single-line strings, refer t

groff_out(5) - groff intermediate output format (Man Page)
This manual page describes the intermediate output format of the GNU roff(7) text processing system groff(1). This output is produced by a run of the GNU troff(

play(1) - Sound eXchange, the Swiss Army knife of audio mani
Introduction SoX reads and writes audio files in most popular formats and can optionally apply effects to them. It can combine multiple input sources, synthesis

iceccd(1) - Icecream daemon (Commands - Linux man page).....
The Icecream daemon has to run on all nodes being part of the Icecream compile cluster. It receives compile jobs and executes them in a chroot environment. The

clockdiff(8) - measure clock difference between hosts.......
clockdiff Measures clock difference between us and destination with 1 msec resolution using ICMP TIMESTAMP [2] packets or, optionally, IP TIMESTAMP option [3] o

We can't live, work or learn in freedom unless the software we use is free.