f78
Options to diff
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
'
Show lines (an integer) lines of context. This option does not specify an output format
by itself; it has no effect unless it is combined with '-c' (see Context Format) or '-u' (see Unified Format). This option is obsolete. For proper operation, patch typically needs at least two lines of context.
Treat all files as text and compare them line-by-line, even if they do not
seem to be text. See Binary Files and Forcing Text Comparisons .
Ignore changes in amount of white space. See Suppressing Differences in Blank and Tab Spacing .
Ignore changes that just insert or delete blank lines. See Suppressing Differences in Blank Lines .
Read and write data in binary mode. See
ffb
Binary Files and Forcing Text Comparisons.
Report only whether the files differ, not the details of the differences. See Summarizing Which Files Differ.
Use the context output format. See Context Format.
'--context[=lines]'
Use the context output format, showing lines (an integer) lines of context, or three if lines is not given. See Context Format. For proper operation, patch typically needs at least two lines of context.
Use format to output a line group containing differing lines from both files in
if-then-else format. See Line Group Formats.
Change the algorithm perhaps find a smaller set of changes. This makes diff slower (sometimes much slower). See diff Performance Tradeoffs.
Make merged '#ifdef' format output, conditional on the pre-processor macro name. See Merging Files with If-then-else.
'--ed'
Make output that is a valid ed script. See ed Scripts.
When comparing directories, ignore files and subdirectories whose basenames
match pattern. See Comparing Directories.
When comparing directories, ignore files and subdirectories whose basenames
match any pattern contained in file. See Comparing Directories.
Expand tabs to spaces in the output, to preserve the align-ment of tabs in the
input files. See Preserving Tabstop Alignment.
Make output that looks vaguely like an ed script but has changes in the order
they appear in the file. See Forward ed Scripts.
In context and unified format, for each hunk of differences, show some of the
last preceding line that matches regexp. See "Showing Lines That Match Regular Expressions" in Showing Which Sections Differences Are in.
Make output that looks vaguely like an ed script but has changes in the order they appear in the file. See Forward ed Scripts .
This option currently has no effect; it is present for Unix compatibility.
Use heuristics to speed handling of large files that have nu-merous scattered
small changes. See diff Pe
ffb
rformance tradeoffs .
Do not discard the last lines lines of the common prefix and the first lines lines of the common suffix. See diff Performance tradeoffs.
Ignore changes in case; consider uppercase and lowercase letters equivalent.
See Suppressing Case Differences.
Ignore changes that just insert or delete lines that match regexp. See "Showing Lines That Match Regular Expressions" in Showing Which Sections Differences Are in.
Make merged if-then-else output using name. See Merging Files with If-then-else.
Ignore white space when comparing lines. See Suppressing Differences in Blank and Tab Spacing.
Ignore changes that just insert or delete blank lines. See Suppressing Differences in Blank Lines.
Ignore changes in case; consider upper- and lower-case to be the same. See Suppressing Case Differences.
Ignore changes that just insert or delete lines that match regexp. See Suppressing Lines Matching a Regular Expression.
Ignore changes in amount of white space. See Suppressing Differences in Blank and Tab Spacing .
Output a tab rather than a space before the text of a line in normal or
context format. This causes the alignment of tabs in the line to look normal. See Preserving Tabstop Alignment.
Pass the output through pr to paginate it. See Paginating diff Output.
Use label instead of the file name in the context format (see "Detailed Description of
Context Format" in Context Format) and unified format (see "Detailed Description of Unified Format" in Unified Format ) headers. See RCS Scripts.
Use label instead of the file name in the context format (see "Detailed Description of
Context Format" in Context Format) and unified format (see "Detailed Description of Unified Format" in Unified Format) headers.
Print only the left column of two common lines in side by side format. See Controlling Side by Side Format.
Use format to output all input lines in if-then-else format. See Line Formats.
Change the algorithm to perhaps find a smaller set of changes. This makes diff slower (sometimes much slower). See diff Performance Tradeoffs.
Output RCS-format diffs; like '-f' except that each command specifies the number of lines affected. See RCS Scripts.
'--new-file'
In directory comparison, if a file is found in only one directory, treat it as
present but empty in the other directory. See Comparing Directories.
Use format to output a group of lines taken from just the second file in if-then-else format. See Line Group Formats.
Use format to output a line taken from just the second file in if-then-else format. See Line Formats.
Use format to output a group of lines taken from just the first file in if-then-else
format. See Line Group Formats.
Use format to output a line taken from just the first file in if-then- else format. See Line Formats.
Show which C function each change is in. See "Showing C Function Headings" in Showing Which Sections Differences Are in.
When comparing directories, if a file appears only in the second directory of
the two, treat it as present but empty in the other. See
ffb
Comparing Directories.
Pass the output through pr to paginate it. See Paginating diff Output.
Report only whether the files differ, not the details of the differences. See Summarizing Which Files Differ.
When comparing directories, recursively compare any sub-directories found. See Comparing Directories.
Output RCS-format diffs; like '-f' except that each command specifies the number of lines affected. See RCS Scripts.
When comparing directories, recursively compare any sub-directories found. See Comparing Directories .
Report when two files are the same. See Comparing Directories.
Report when two files are the same. See Comparing Directories.
When comparing directories, start with the file, file. This is used for resuming an aborted comparison. See Comparing Directories.
Print extra information to help sdiff. sdiff uses this option when it runs diff. This option is not intended for users to use directly.
Show which C function each
ffb
change is in. See "Showing C Function Headings" in Showing Which Sections Differences Are in.
In context and unified format, for each hunk of differences, show some of the
last preceding line that matches regexp. See "Showing Lines That Match Regular Expressions" in Showing Which Sections Differences Are in.
Use the side by side output format. See Controlling Side by Side Format.
Use heuristics to speed handling of large files that have nu-merous scattered
small changes. See diff Performance Tradeoffs.
When comparing directories, start with the file, file. This is used for resuming an aborted comparison. See Comparing Directories.
Do not print common lines in side by side format. See Controlling Side by Side Format.
Expand tabs to spaces in the output, to preserve the alignment of tabs in the
input files. See Preserving Tabstop Alignment.
Output a tab rather than a space before the text of a line in normal or
context format. This causes the alignment of tabs in the line to look normal. See Preserving Tabstop Alignment.
Treat all files as text and compare them line-by-line, even if they do not
appear to be text. See Binary Files and Forcing Text Comparisons.
Use the unified output format. See Un
ffb
ified Format.
Use format to output a group of common lines taken from both files in if-then-else
format. See Line Group Formats.
Use format to output a line common to both files in if-then-else format. See Line Formats.
When comparing directories, if a file appears only in the second directory of
the two, treat it as present but empty in the other. See Comparing Directories.
'--unified[= lines]'
Use the unified output format, showing lines (an integer) lines of context, or three if lines is not given. See Unified Format. For proper operation, patch typically needs at least two lines of context.
'--version'
Output the version number of diff.
Ignore white space when comparing lines. See Suppressing Differences in Blank and Tab Spacing.
'--width=columns'
Use an output width of columns in side by side format. See Controlling Side by Side Format .
When comparing directories, ignore files and subdir
4ed
ectories whose basenames
match pattern. See Comparing Directories.
When comparing directories, ignore files and subdirectories whose basenames
match any pattern contained in file. See Comparing Directories.
Use the side by side output format. See Controlling Side by Side Format.