Update diff-options and config documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
fef88bb013
commit
b53766483f
@ -110,6 +110,22 @@ apply.whitespace::
|
||||
Tells `git-apply` how to handle whitespaces, in the same way
|
||||
as the '--whitespace' option. See gitlink:git-apply[1].
|
||||
|
||||
diff.color::
|
||||
When true (or `always`), always use colors in patch.
|
||||
When false (or `never`), never. When set to `auto`, use
|
||||
colors only when the output is to the terminal.
|
||||
|
||||
diff.color.<slot>::
|
||||
Use customized color for diff colorization. `<slot>`
|
||||
specifies which part of the patch to use the specified
|
||||
color, and is one of `plain` (context text), `meta`
|
||||
(metainformation), `frag` (hunk header), `old` (removed
|
||||
lines), or `new` (added lines). The value for these
|
||||
configuration variables can be one of: `normal`, `bold`,
|
||||
`dim`, `ul`, `blink`, `reverse`, `reset`, `black`,
|
||||
`red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, or
|
||||
`white`.
|
||||
|
||||
diff.renameLimit::
|
||||
The number of files to consider when performing the copy/rename
|
||||
detection; equivalent to the git diff option '-l'.
|
||||
|
@ -4,18 +4,21 @@
|
||||
-u::
|
||||
Synonym for "-p".
|
||||
|
||||
--raw::
|
||||
Generate the raw format.
|
||||
|
||||
--patch-with-raw::
|
||||
Generate patch but keep also the default raw diff output.
|
||||
Synonym for "-p --raw".
|
||||
|
||||
--stat::
|
||||
Generate a diffstat instead of a patch.
|
||||
Generate a diffstat.
|
||||
|
||||
--summary::
|
||||
Output a condensed summary of extended header information
|
||||
such as creations, renames and mode changes.
|
||||
|
||||
--patch-with-stat::
|
||||
Generate patch and prepend its diffstat.
|
||||
Synonym for "-p --stat".
|
||||
|
||||
-z::
|
||||
\0 line termination on output
|
||||
@ -26,10 +29,25 @@
|
||||
--name-status::
|
||||
Show only names and status of changed files.
|
||||
|
||||
--color::
|
||||
Show colored diff.
|
||||
|
||||
--no-color::
|
||||
Turn off colored diff, even when the configuration file
|
||||
gives the default to color output.
|
||||
|
||||
--no-renames::
|
||||
Turn off rename detection, even when the configuration
|
||||
file gives the default to do so.
|
||||
|
||||
--full-index::
|
||||
Instead of the first handful characters, show full
|
||||
object name of pre- and post-image blob on the "index"
|
||||
line when generating a patch format output.
|
||||
line when generating a patch format output.
|
||||
|
||||
--binary::
|
||||
In addition to --full-index, output "binary diff" that
|
||||
can be applied with "git apply".
|
||||
|
||||
--abbrev[=<n>]::
|
||||
Instead of showing the full 40-byte hexadecimal object
|
||||
|
Loading…
Reference in New Issue
Block a user