diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:34:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:34:45 -0800 |
| commit | b918eb6c2a949282a223bdb04ec8a524003f8c0c (patch) | |
| tree | b5a3197f569ea3b42ada2e149e21fcf7b8740ef2 /Documentation | |
| parent | e160da7f60e67ee548472d907ede3291bbc2a79e (diff) | |
| parent | 89cb73a19ac94d15babf77af490fa5db78908234 (diff) | |
| download | git-b918eb6c2a949282a223bdb04ec8a524003f8c0c.tar.gz git-b918eb6c2a949282a223bdb04ec8a524003f8c0c.tar.xz | |
Merge branch 'bw/diff-color-hunk-header'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index a8e0876a2..a1e36d7e4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -635,10 +635,10 @@ 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 `plain` (context text), `meta` (metainformation), `frag` - (hunk header), `old` (removed lines), `new` (added lines), - `commit` (commit headers), or `whitespace` (highlighting - whitespace errors). The values of these variables may be specified as - in color.branch.<slot>. + (hunk header), 'func' (function in hunk header), `old` (removed lines), + `new` (added lines), `commit` (commit headers), or `whitespace` + (highlighting whitespace errors). The values of these variables may be + specified as in color.branch.<slot>. color.grep:: When set to `always`, always highlight matches. When `false` (or |