|Comparing and Merging Files with GNU diff and patch|
by David MacKenzie, Paul Eggert, and Richard Stallman
Paperback (6"x9"), 120 pages
RRP £12.95 ($19.95)
"Well packaged... the quality of information is excellent" --- Linux User and Developer Magazine (Issue 36, Feb 2004) Get a printed copy>>>
16.1 Options to
Below is a summary of all of the options that GNU
Each option has two equivalent names, one of which is a single
letter preceded by ‘-’, and the other of which is a long name
preceded by ‘--’. Multiple single letter options (unless they take
an argument) can be combined into a single command line argument. Long
named options can be abbreviated to any unique prefix of their name.
- Treat all files as text and compare them line-by-line, even if they do not appear to be text. See section 1.7 Binary Files and Forcing Text Comparisons.
- Ignore changes in amount of white space. See section 1.2 Suppressing Differences in Blank and Tab Spacing.
- Ignore changes that just insert or delete blank lines. See section 1.3 Suppressing Differences in Blank Lines.
Change the algorithm to perhaps find a smaller set of changes. This
sdiffslower (sometimes much slower). See section 6
Use the compatible comparison program program to compare files
- Ignore changes due to tab expansion. See section 1.2 Suppressing Differences in Blank and Tab Spacing.
- Output a summary of usage and then exit.
- Ignore changes in case; consider upper- and lower-case to be the same. See section 1.4 Suppressing Case Differences.
- Ignore changes that just insert or delete lines that match regexp. See section 1.5 Suppressing Lines Matching a Regular Expression.
- Print only the left column of two common lines. See section 2.4.1 Controlling Side by Side Format.
- Put merged output into file. This option is required for merging.
- Do not print common lines. See section 2.4.1 Controlling Side by Side Format.
Use heuristics to speed handling of large files that have numerous
scattered small changes. See section 6
- Strip any trailing carriage return at the end of an input line. See section 1.7 Binary Files and Forcing Text Comparisons.
- Expand tabs to spaces in the output, to preserve the alignment of tabs in the input files. See section 5.1 Preserving Tab Stop Alignment.
- Output version information and then exit.
Output at most columns (default 130) print columns per line.
See section 2.4.1 Controlling Side by Side Format. Note that for historical reasons, this
Ignore white space when comparing lines. See section 1.2 Suppressing Differences in Blank and Tab Spacing.
Note that for historical reasons, this option is
|ISBN 0954161750||Comparing and Merging Files with GNU diff and patch||See the print edition|