diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-18 08:59:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-18 08:59:48 -0700 |
| commit | 96825a805419628c35f9fea70997aa749dbb2750 (patch) | |
| tree | 86e53f950158a442f082ad61d0ba755ace49cfec /Documentation/config.txt | |
| parent | 7f1eaec7f477fb3e81b9c5489d9ecf9bbefe0b8c (diff) | |
| parent | 6123d7196fdd9ac9aed24b4aeed854813fe9a6b1 (diff) | |
| download | git-96825a805419628c35f9fea70997aa749dbb2750.tar.gz git-96825a805419628c35f9fea70997aa749dbb2750.tar.xz | |
Merge branch 'mh/show-branch-color'
* mh/show-branch-color:
bash completion: show-branch color support
show-branch: color the commit status signs
Conflicts:
contrib/completion/git-completion.bash
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5dcad94f8..2c031620c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -604,6 +604,12 @@ color.pager:: A boolean to enable/disable colored output when the pager is in use (default is true). +color.showbranch:: + A boolean to enable/disable color in the output of + linkgit:git-show-branch[1]. May be set to `always`, + `false` (or `never`) or `auto` (or `true`), in which case colors are used + only when the output is to a terminal. Defaults to false. + color.status:: A boolean to enable/disable color in the output of linkgit:git-status[1]. May be set to `always`, |