@matheusbsbs / matheus-bagliano / commits / b53766483f
Fork 0

Update diff-options and config documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jul 7, 2006 at 05:28 UTC b53766483ff14f73be954617349b18ea56c3187a
2 files changed +38 -4
Documentation/config.txt
+16
@@ -110,6 +110,22 @@ apply.whitespace::
110 Tells `git-apply` how to handle whitespaces, in the same way
111 as the '--whitespace' option. See gitlink:git-apply[1].
112
113 +diff.color::
114 + When true (or `always`), always use colors in patch.
115 + When false (or `never`), never. When set to `auto`, use
116 + colors only when the output is to the terminal.
117 +
118 +diff.color.<slot>::
119 + Use customized color for diff colorization. `<slot>`
120 + specifies which part of the patch to use the specified
121 + color, and is one of `plain` (context text), `meta`
122 + (metainformation), `frag` (hunk header), `old` (removed
123 + lines), or `new` (added lines). The value for these
124 + configuration variables can be one of: `normal`, `bold`,
125 + `dim`, `ul`, `blink`, `reverse`, `reset`, `black`,
126 + `red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, or
127 + `white`.
128 +
129 diff.renameLimit::
130 The number of files to consider when performing the copy/rename
131 detection; equivalent to the git diff option '-l'.
Documentation/diff-options.txt
+22 -4
@@ -4,18 +4,21 @@
4 -u::
5 Synonym for "-p".
6
7 +--raw::
8 + Generate the raw format.
9 +
10 --patch-with-raw::
8 - Generate patch but keep also the default raw diff output.
11 + Synonym for "-p --raw".
12
13 --stat::
11 - Generate a diffstat instead of a patch.
14 + Generate a diffstat.
15
16 --summary::
17 Output a condensed summary of extended header information
18 such as creations, renames and mode changes.
19
20 --patch-with-stat::
18 - Generate patch and prepend its diffstat.
21 + Synonym for "-p --stat".
22
23 -z::
24 \0 line termination on output
@@ -26,10 +29,25 @@
29 --name-status::
30 Show only names and status of changed files.
31
32 +--color::
33 + Show colored diff.
34 +
35 +--no-color::
36 + Turn off colored diff, even when the configuration file
37 + gives the default to color output.
38 +
39 +--no-renames::
40 + Turn off rename detection, even when the configuration
41 + file gives the default to do so.
42 +
43 --full-index::
44 Instead of the first handful characters, show full
45 object name of pre- and post-image blob on the "index"
32 - line when generating a patch format output.
46 + line when generating a patch format output.
47 +
48 +--binary::
49 + In addition to --full-index, output "binary diff" that
50 + can be applied with "git apply".
51
52 --abbrev[=<n>]::
53 Instead of showing the full 40-byte hexadecimal object