diff options
author | Stefan Beller <sbeller@google.com> | 2017-06-30 20:53:10 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-30 20:59:42 (GMT) |
commit | 61e89eaae8824926dc03c47e6ab3aa990b5b832e (patch) | |
tree | 6cd01e56dc1797fe159dfe812d3dba30524f103d /Documentation/config.txt | |
parent | 86b452e2769e80b220327b1301c7487ad4afa4f4 (diff) | |
download | git-61e89eaae8824926dc03c47e6ab3aa990b5b832e.zip git-61e89eaae8824926dc03c47e6ab3aa990b5b832e.tar.gz git-61e89eaae8824926dc03c47e6ab3aa990b5b832e.tar.bz2 |
diff: document the new --color-moved setting
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r-- | Documentation/config.txt | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 06898a7..74382e5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1077,14 +1077,25 @@ This does not affect linkgit:git-format-patch[1] or the 'git-diff-{asterisk}' plumbing commands. Can be overridden on the command line with the `--color[=<when>]` option. +diff.colorMoved:: + If set to either a valid `<mode>` or a true value, moved lines + in a diff are colored differently, for details of valid modes + see '--color-moved' in linkgit:git-diff[1]. If simply set to + true the default color mode will be used. When set to false, + moved lines are not colored. + color.diff.<slot>:: Use customized color for diff colorization. `<slot>` specifies which part of the patch to use the specified color, and is one of `context` (context text - `plain` is a historical synonym), `meta` (metainformation), `frag` (hunk header), 'func' (function in hunk header), `old` (removed lines), - `new` (added lines), `commit` (commit headers), or `whitespace` - (highlighting whitespace errors). + `new` (added lines), `commit` (commit headers), `whitespace` + (highlighting whitespace errors), `oldMoved` (deleted lines), + `newMoved` (added lines), `oldMovedDimmed`, `oldMovedAlternative`, + `oldMovedAlternativeDimmed`, `newMovedDimmed`, `newMovedAlternative` + and `newMovedAlternativeDimmed` (See the '<mode>' + setting of '--color-moved' in linkgit:git-diff[1] for details). color.decorate.<slot>:: Use customized color for 'git log --decorate' output. `<slot>` is one |