Go to main content

man pages section 1: User Commands

Exit Print View

Updated: Thursday, March 14, 2019
 
 

rediff (1)

Name

rediff - edited diff

Synopsis

rediff ORIGINAL EDITED

rediff EDITED

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

editdiff FILE

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

Description

REDIFF(1)                          Man pages                         REDIFF(1)



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

SYNOPSIS
       rediff ORIGINAL EDITED

       rediff EDITED

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

       editdiff FILE

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

DESCRIPTION
       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:

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

       o   Adding new line insertions or deletions.

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

       o   Adding a single hunk (@@-prefixed section).

       o   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.

OPTIONS
       --help
           Display a short usage message.

       --version
           Display the version number of rediff.


ATTRIBUTES
       See attributes(7) for descriptions of the following attributes:


       +---------------+------------------+
       |ATTRIBUTE TYPE | ATTRIBUTE VALUE  |
       +---------------+------------------+
       |Availability   | text/patchutils  |
       +---------------+------------------+
       |Stability      | Volatile         |
       +---------------+------------------+
SEE ALSO
       interdiff(1), recountdiff(1)

AUTHOR
       Tim Waugh <twaugh@redhat.com>
           Package maintainer



NOTES
       This software was built from source available at
       https://github.com/oracle/solaris-userland.  The original community
       source was downloaded from
       http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.4.tar.xz

       Further information about this software can be found on the open source
       community website at http://cyberelk.net/tim/patchutils/.



patchutils                        13 May 2002                        REDIFF(1)