{"thread":{"id":"6571","subject":"[PATCH] Documentation/config.txt: Fix documentation of colour config tweaks.","startedAt":"2007-01-28T15:17:36Z","lastAt":"2007-01-28T21:01:46Z","messageCount":2,"participants":["Mark Wooding","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"32916","messageId":"11699974561956-git-send-email-mdw@distorted.org.uk","threadId":"6571","inReplyTo":null,"subject":"[PATCH] Documentation/config.txt: Fix documentation of colour config tweaks.","fromName":"Mark Wooding","fromEmail":"mdw@distorted.org.uk","sentAt":"2007-01-28T15:17:36Z","receivedAt":"2007-01-28T15:17:36Z","isPatch":true,"sender":{"key":"mdw@distorted.org.uk","avatar":null},"body":"  * The description of valid colour specifications was rather\n    incomplete, so fix it so that it actually describes colour specs as\n    accepted by color_parse().\n\n  * The list of colour items allowed in color.diff.BLAH was missing the\n    `commit' and `whitespace' entries.\n\nSigned-off-by: Mark Wooding <mdw@distorted.org.uk>\n---\n\nCan anyone tell that I've been messing with Git's colour output recently? ;-)\n\n Documentation/config.txt |   26 ++++++++++++++++----------\n 1 files changed, 16 insertions(+), 10 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 3f2fa09..15f12cf 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -250,10 +250,15 @@ color.branch.<slot>::\n \tUse customized color for branch coloration. `<slot>` is one of\n \t`current` (the current branch), `local` (a local branch),\n \t`remote` (a tracking branch in refs/remotes/), `plain` (other\n-\trefs), or `reset` (the normal terminal color).  The value for\n-\tthese configuration variables can be one of: `normal`, `bold`,\n-\t`dim`, `ul`, `blink`, `reverse`, `reset`, `black`, `red`,\n-\t`green`, `yellow`, `blue`, `magenta`, `cyan`, or `white`.\n+\trefs).\n++\n+The value for these configuration variables is a list of colors (at most\n+two) and attributes (at most one), separated by spaces.  The colors\n+accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`,\n+`magenta`, `cyan` and `white`; the attributes are `bold`, `dim`, `ul`,\n+`blink` and `reverse`.  The first color given is the foreground; the\n+second is the background.  The position of the attribute, if any,\n+doesn't matter.\n \n color.diff::\n \tWhen true (or `always`), always use colors in patch.\n@@ -261,12 +266,13 @@ color.diff::\n \tcolors only when the output is to the terminal.\n \n color.diff.<slot>::\n-\tUse customized color for diff colorization.  `<slot>`\n-\tspecifies which part of the patch to use the specified\n-\tcolor, and is one of `plain` (context text), `meta`\n-\t(metainformation), `frag` (hunk header), `old` (removed\n-\tlines), or `new` (added lines).  The values of these\n-\tvariables may be specified as in color.branch.<slot>.\n+\tUse customized color for diff colorization.  `<slot>` specifies\n+\twhich part of the patch to use the specified color, and is one\n+\tof `plain` (context text), `meta` (metainformation), `frag`\n+\t(hunk header), `old` (removed lines), `new` (added lines),\n+\t`commit` (commit headers), or `whitespace` (highlighting dubious\n+\twhitespace).  The values of these variables may be specified as\n+\tin color.branch.<slot>.\n \n color.pager::\n \tA boolean to enable/disable colored output when the pager is in\n-- \n1.5.0.rc2.g4e206\n"},{"id":"32930","messageId":"7vzm82dfwl.fsf@assigned-by-dhcp.cox.net","threadId":"6571","inReplyTo":"11699974561956-git-send-email-mdw@distorted.org.uk","subject":"Re: [PATCH] Documentation/config.txt: Fix documentation of colour config tweaks.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-01-28T21:01:46Z","receivedAt":"2007-01-28T21:01:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks; applied both.\n"}]}