-
-p
-
--no-stat
-
Generate plain patches without any diffstats.
-
-U<n>
-
--unified=<n>
-
Generate diffs with <n> lines of context instead of
the usual three.
-
--output=<file>
-
Output to a specific file instead of stdout.
-
--output-indicator-new=<char>
-
--output-indicator-old=<char>
-
--output-indicator-context=<char>
-
Specify the character used to indicate new, old or context
lines in the generated patch. Normally they are +, - and
' ' respectively.
-
--indent-heuristic
-
Enable the heuristic that shifts diff hunk boundaries to make patches
easier to read. This is the default.
-
--no-indent-heuristic
-
Disable the indent heuristic.
-
--minimal
-
Spend extra time to make sure the smallest possible
diff is produced.
-
--patience
-
Generate a diff using the "patience diff" algorithm.
-
--histogram
-
Generate a diff using the "histogram diff" algorithm.
-
--anchored=<text>
-
Generate a diff using the "anchored diff" algorithm.
This option may be specified more than once.
If a line exists in both the source and destination, exists only once,
and starts with this text, this algorithm attempts to prevent it from
appearing as a deletion or addition in the output. It uses the "patience
diff" algorithm internally.
-
--diff-algorithm={patience|minimal|histogram|myers}
-
Choose a diff algorithm. The variants are as follows:
-
default, myers
-
The basic greedy diff algorithm. Currently, this is the default.
-
minimal
-
Spend extra time to make sure the smallest possible diff is
produced.
-
patience
-
Use "patience diff" algorithm when generating patches.
-
histogram
-
This algorithm extends the patience algorithm to "support
low-occurrence common elements".
For instance, if you configured the diff.algorithm variable to a
non-default value and want to use the default one, then you
have to use --diff-algorithm=default option.
-
--stat[=<width>[,<name-width>[,<count>]]]
-
Generate a diffstat. By default, as much space as necessary
will be used for the filename part, and the rest for the graph
part. Maximum width defaults to terminal width, or 80 columns
if not connected to a terminal, and can be overridden by
<width>. The width of the filename part can be limited by
giving another width <name-width> after a comma or by setting
diff.statNameWidth=<width>. The width of the graph part can be
limited by using --stat-graph-width=<width> or by setting
diff.statGraphWidth=<width>. Using --stat or
--stat-graph-width affects all commands generating a stat graph,
while setting diff.statNameWidth or diff.statGraphWidth
does not affect git format-patch.
By giving a third parameter <count>, you can limit the output to
the first <count> lines, followed by ... if there are more.
These parameters can also be set individually with --stat-width=<width>,
--stat-name-width=<name-width> and --stat-count=<count>.
-
--compact-summary
-
Output a condensed summary of extended header information such
as file creations or deletions ("new" or "gone", optionally "+l"
if it’s a symlink) and mode changes ("+x" or "-x" for adding
or removing executable bit respectively) in diffstat. The
information is put between the filename part and the graph
part. Implies --stat.
-
--numstat
-
Similar to --stat, but shows number of added and
deleted lines in decimal notation and pathname without
abbreviation, to make it more machine friendly. For
binary files, outputs two - instead of saying
0 0.
-
--shortstat
-
Output only the last line of the --stat format containing total
number of modified files, as well as number of added and deleted
lines.
-
-X[<param1,param2,…>]
-
--dirstat[=<param1,param2,…>]
-
Output the distribution of relative amount of changes for each
sub-directory. The behavior of --dirstat can be customized by
passing it a comma separated list of parameters.
The defaults are controlled by the diff.dirstat configuration
variable (see git-config(1)).
The following parameters are available:
-
changes
-
Compute the dirstat numbers by counting the lines that have been
removed from the source, or added to the destination. This ignores
the amount of pure code movements within a file. In other words,
rearranging lines in a file is not counted as much as other changes.
This is the default behavior when no parameter is given.
-
lines
-
Compute the dirstat numbers by doing the regular line-based diff
analysis, and summing the removed/added line counts. (For binary
files, count 64-byte chunks instead, since binary files have no
natural concept of lines). This is a more expensive --dirstat
behavior than the changes behavior, but it does count rearranged
lines within a file as much as other changes. The resulting output
is consistent with what you get from the other --*stat options.
-
files
-
Compute the dirstat numbers by counting the number of files changed.
Each changed file counts equally in the dirstat analysis. This is
the computationally cheapest --dirstat behavior, since it does
not have to look at the file contents at all.
-
cumulative
-
Count changes in a child directory for the parent directory as well.
Note that when using cumulative, the sum of the percentages
reported may exceed 100%. The default (non-cumulative) behavior can
be specified with the noncumulative parameter.
-
<limit>
-
An integer parameter specifies a cut-off percent (3% by default).
Directories contributing less than this percentage of the changes
are not shown in the output.
Example: The following will count changed files, while ignoring
directories with less than 10% of the total amount of changed files,
and accumulating child directory counts in the parent directories:
--dirstat=files,10,cumulative.
-
--cumulative
-
Synonym for --dirstat=cumulative
-
--dirstat-by-file[=<param1,param2>…]
-
Synonym for --dirstat=files,param1,param2…
-
--summary
-
Output a condensed summary of extended header information
such as creations, renames and mode changes.
-
--no-renames
-
Turn off rename detection, even when the configuration
file gives the default to do so.
-
--[no-]rename-empty
-
Whether to use empty blobs as rename source.
-
--full-index
-
Instead of the first handful of characters, show the full
pre- and post-image blob object names on the "index"
line when generating patch format output.
-
--binary
-
In addition to --full-index, output a binary diff that
can be applied with git-apply.
-
--abbrev[=<n>]
-
Instead of showing the full 40-byte hexadecimal object
name in diff-raw format output and diff-tree header
lines, show the shortest prefix that is at least <n>
hexdigits long that uniquely refers the object.
In diff-patch output format, --full-index takes higher
precedence, i.e. if --full-index is specified, full blob
names will be shown regardless of --abbrev.
Non default number of digits can be specified with --abbrev=<n>.
-
-B[<n>][/<m>]
-
--break-rewrites[=[<n>][/<m>]]
-
Break complete rewrite changes into pairs of delete and
create. This serves two purposes:
It affects the way a change that amounts to a total rewrite of a file
not as a series of deletion and insertion mixed together with a very
few lines that happen to match textually as the context, but as a
single deletion of everything old followed by a single insertion of
everything new, and the number m controls this aspect of the -B
option (defaults to 60%). -B/70% specifies that less than 30% of the
original should remain in the result for Git to consider it a total
rewrite (i.e. otherwise the resulting patch will be a series of
deletion and insertion mixed together with context lines).
When used with -M, a totally-rewritten file is also considered as the
source of a rename (usually -M only considers a file that disappeared
as the source of a rename), and the number n controls this aspect of
the -B option (defaults to 50%). -B20% specifies that a change with
addition and deletion compared to 20% or more of the file’s size are
eligible for being picked up as a possible source of a rename to
another file.
-
-M[<n>]
-
--find-renames[=<n>]
-
Detect renames.
If n is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
file’s size). For example, -M90% means Git should consider a
delete/add pair to be a rename if more than 90% of the file
hasn’t changed. Without a % sign, the number is to be read as
a fraction, with a decimal point before it. I.e., -M5 becomes
0.5, and is thus the same as -M50%. Similarly, -M05 is
the same as -M5%. To limit detection to exact renames, use
-M100%. The default similarity index is 50%.
-
-C[<n>]
-
--find-copies[=<n>]
-
Detect copies as well as renames. See also --find-copies-harder.
If n is specified, it has the same meaning as for -M<n>.
-
--find-copies-harder
-
For performance reasons, by default, -C option finds copies only
if the original file of the copy was modified in the same
changeset. This flag makes the command
inspect unmodified files as candidates for the source of
copy. This is a very expensive operation for large
projects, so use it with caution. Giving more than one
-C option has the same effect.
-
-D
-
--irreversible-delete
-
Omit the preimage for deletes, i.e. print only the header but not
the diff between the preimage and /dev/null. The resulting patch
is not meant to be applied with patch or git apply; this is
solely for people who want to just concentrate on reviewing the
text after the change. In addition, the output obviously lacks
enough information to apply such a patch in reverse, even manually,
hence the name of the option.
When used together with -B, omit also the preimage in the deletion part
of a delete/create pair.
-
-l<num>
-
The -M and -C options involve some preliminary steps that
can detect subsets of renames/copies cheaply, followed by an
exhaustive fallback portion that compares all remaining
unpaired destinations to all relevant sources. (For renames,
only remaining unpaired sources are relevant; for copies, all
original sources are relevant.) For N sources and
destinations, this exhaustive check is O(N^2). This option
prevents the exhaustive portion of rename/copy detection from
running if the number of source/destination files involved
exceeds the specified number. Defaults to diff.renameLimit.
Note that a value of 0 is treated as unlimited.
-
-O<orderfile>
-
Control the order in which files appear in the output.
This overrides the diff.orderFile configuration variable
(see git-config(1)). To cancel diff.orderFile,
use -O/dev/null.
The output order is determined by the order of glob patterns in
<orderfile>.
All files with pathnames that match the first pattern are output
first, all files with pathnames that match the second pattern (but not
the first) are output next, and so on.
All files with pathnames that do not match any pattern are output
last, as if there was an implicit match-all pattern at the end of the
file.
If multiple pathnames have the same rank (they match the same pattern
but no earlier patterns), their output order relative to each other is
the normal order.
<orderfile> is parsed as follows:
-
Blank lines are ignored, so they can be used as separators for
readability.
-
Lines starting with a hash ("#") are ignored, so they can be used
for comments. Add a backslash ("\") to the beginning of the
pattern if it starts with a hash.
-
Each other line contains a single pattern.
Patterns have the same syntax and semantics as patterns used for
fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
matches a pattern if removing any number of the final pathname
components matches the pattern. For example, the pattern "foo*bar"
matches "fooasdfbar" and "foo/bar/baz/asdf" but not "foobarx".
-
--skip-to=<file>
-
--rotate-to=<file>
-
Discard the files before the named <file> from the output
(i.e. skip to), or move them to the end of the output
(i.e. rotate to). These options were invented primarily for the use
of the git difftool command, and may not be very useful
otherwise.
-
--relative[=<path>]
-
--no-relative
-
When run from a subdirectory of the project, it can be
told to exclude changes outside the directory and show
pathnames relative to it with this option. When you are
not in a subdirectory (e.g. in a bare repository), you
can name which subdirectory to make the output relative
to by giving a <path> as an argument.
--no-relative can be used to countermand both diff.relative config
option and previous --relative.
-
-a
-
--text
-
Treat all files as text.
-
--ignore-cr-at-eol
-
Ignore carriage-return at the end of line when doing a comparison.
-
--ignore-space-at-eol
-
Ignore changes in whitespace at EOL.
-
-b
-
--ignore-space-change
-
Ignore changes in amount of whitespace. This ignores whitespace
at line end, and considers all other sequences of one or
more whitespace characters to be equivalent.
-
-w
-
--ignore-all-space
-
Ignore whitespace when comparing lines. This ignores
differences even if one line has whitespace where the other
line has none.
-
--ignore-blank-lines
-
Ignore changes whose lines are all blank.
-
-I<regex>
-
--ignore-matching-lines=<regex>
-
Ignore changes whose all lines match <regex>. This option may
be specified more than once.
-
--inter-hunk-context=<lines>
-
Show the context between diff hunks, up to the specified number
of lines, thereby fusing hunks that are close to each other.
Defaults to diff.interHunkContext or 0 if the config option
is unset.
-
-W
-
--function-context
-
Show whole function as context lines for each change.
The function names are determined in the same way as
git diff works out patch hunk headers (see Defining a
custom hunk-header in gitattributes(5)).
-
--ext-diff
-
Allow an external diff helper to be executed. If you set an
external diff driver with gitattributes(5), you need
to use this option with git-log(1) and friends.
-
--no-ext-diff
-
Disallow external diff drivers.
-
--textconv
-
--no-textconv
-
Allow (or disallow) external text conversion filters to be run
when comparing binary files. See gitattributes(5) for
details. Because textconv filters are typically a one-way
conversion, the resulting diff is suitable for human
consumption, but cannot be applied. For this reason, textconv
filters are enabled by default only for git-diff(1) and
git-log(1), but not for git-format-patch(1) or
diff plumbing commands.
-
--ignore-submodules[=<when>]
-
Ignore changes to submodules in the diff generation. <when> can be
either "none", "untracked", "dirty" or "all", which is the default.
Using "none" will consider the submodule modified when it either contains
untracked or modified files or its HEAD differs from the commit recorded
in the superproject and can be used to override any settings of the
ignore option in git-config(1) or gitmodules(5). When
"untracked" is used submodules are not considered dirty when they only
contain untracked content (but they are still scanned for modified
content). Using "dirty" ignores all changes to the work tree of submodules,
only changes to the commits stored in the superproject are shown (this was
the behavior until 1.7.0). Using "all" hides all changes to submodules.
-
--src-prefix=<prefix>
-
Show the given source prefix instead of "a/".
-
--dst-prefix=<prefix>
-
Show the given destination prefix instead of "b/".
-
--no-prefix
-
Do not show any source or destination prefix.
-
--default-prefix
-
Use the default source and destination prefixes ("a/" and "b/").
This is usually the default already, but may be used to override
config such as diff.noprefix.
-
--line-prefix=<prefix>
-
Prepend an additional prefix to every line of output.
-
--ita-invisible-in-index
-
By default entries added by "git add -N" appear as an existing
empty file in "git diff" and a new file in "git diff --cached".
This option makes the entry appear as a new file in "git diff"
and non-existent in "git diff --cached". This option could be
reverted with --ita-visible-in-index. Both options are
experimental and could be removed in future.