Linux Manual Pages

Free Software * Books

Source Code

Free Media

Linux

combinediff(1)

NAME

   combinediff - create a cumulative unified patch from two incremental
   patches

SYNOPSIS

   combinediff [[-p n] | [--strip-match=n]] [[-U n] | [--unified=n]]
               [[-d PAT] | [--drop-context=PAT]] [[-q] | [--quiet]] [[-z]
               | [--decompress]] [[-b] | [--ignore-space-change]] [[-B] |
               [--ignore-blank-lines]] [[-i] | [--ignore-case]] [[-w] |
               [--ignore-all-space]] [[--interpolate] | [--combine]] diff1
               diff2

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

DESCRIPTION

   combinediff creates a unified diff that expresses the sum of two diffs.
   The diff files must be listed in the order that they are to be applied.
   For best results, the diffs must have at least three lines of context.

   Since combinediff 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 patch(1) 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 recountdiff(1)
   first.

   Note, however, that the two patches must be in strict incremental
   order. In other words, the second patch must be relative to the state
   of the original set of files after the first patch was applied.

   The diffs may be in context format. The output, however, will be in
   unified format.

OPTIONS

   -p n, --strip-match=n
       When comparing filenames, ignore the first n pathname components
       from both patches. (This is similar to the -p option to GNU
       patch(1).)

   -q, --quiet
       Quieter output. Don't emit rationale lines at the beginning of each
       patch.

   -U n, --unified=n
       Attempt to display n lines of context (requires at least n lines of
       context in both input files). (This is similar to the -U option to
       GNU diff(1).)

   -d pattern, --drop-context=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 "*/basename"-type
       patterns can be given without limiting the number of pathname
       components.

   -i, --ignore-case
       Consider upper- and lower-case to be the same.

   -w, --ignore-all-space
       Ignore whitespace changes in patches.

   -b, --ignore-space-change
       Ignore changes in the amount of whitespace.

   -B, --ignore-blank-lines
       Ignore changes whose lines are all blank.

   -z, --decompress
       Decompress files with extensions .gz and .bz2.

   --interpolate
       Run as "interdiff". See interdiff(1) for more information about how
       the behaviour is altered in this mode.

   --combine
       Run as "combinediff". This is the default.

   --help
       Display a short usage message.

   --version
       Display the version number of combinediff.

BUGS

   The -U option is a bit erratic: it can control the amount of context
   displayed for files that are modified in both patches, but not for
   files that only appear in one patch (which appear with the same amount
   of context in the output as in the input).

AUTHOR

   Tim Waugh <twaugh@redhat.com>
       Package maintainer

Opportunity

Personal Opportunity - Free software gives you access to billions of dollars of software at no cost. Use this software for your business, personal use or to develop a profitable skill. Access to source code provides access to a level of capabilities/information that companies protect though copyrights. Open source is a core component of the Internet and it is available to you. Leverage the billions of dollars in resources and capabilities to build a career, establish a business or change the world. The potential is endless for those who understand the opportunity.

Business Opportunity - Goldman Sachs, IBM and countless large corporations are leveraging open source to reduce costs, develop products and increase their bottom lines. Learn what these companies know about open source and how open source can give you the advantage.

Free Software

Free Software provides computer programs and capabilities at no cost but more importantly, it provides the freedom to run, edit, contribute to, and share the software. The importance of free software is a matter of access, not price. Software at no cost is a benefit but ownership rights to the software and source code is far more significant.

Free Office Software - The Libre Office suite provides top desktop productivity tools for free. This includes, a word processor, spreadsheet, presentation engine, drawing and flowcharting, database and math applications. Libre Office is available for Linux or Windows.

Free Books

The Free Books Library is a collection of thousands of the most popular public domain books in an online readable format. The collection includes great classical literature and more recent works where the U.S. copyright has expired. These books are yours to read and use without restrictions.

Source Code - Want to change a program or know how it works? Open Source provides the source code for its programs so that anyone can use, modify or learn how to write those programs themselves. Visit the GNU source code repositories to download the source.

Education

Study at Harvard, Stanford or MIT - Open edX provides free online courses from Harvard, MIT, Columbia, UC Berkeley and other top Universities. Hundreds of courses for almost all major subjects and course levels. Open edx also offers some paid courses and selected certifications.

Linux Manual Pages - A man or manual page is a form of software documentation found on Linux/Unix operating systems. Topics covered include computer programs (including library and system calls), formal standards and conventions, and even abstract concepts.