diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-07 12:28:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-07 19:28:54 (GMT) |
| commit | b53766483ff14f73be954617349b18ea56c3187a (patch) | |
| tree | 239618175b5d477ddeb61b09db5bf8198e026095 /Documentation/config.txt | |
| parent | fef88bb0134dfd47b4bd17e668bbb860588dcb39 (diff) | |
| download | git-b53766483ff14f73be954617349b18ea56c3187a.zip git-b53766483ff14f73be954617349b18ea56c3187a.tar.gz git-b53766483ff14f73be954617349b18ea56c3187a.tar.bz2 | |
Update diff-options and config documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5290a8f..0b434c1 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -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'. |