diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 12:20:59 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 12:20:59 -0700 |
commit | 58f587aef6ee6b6b759fe8f4dd500f471eee1b88 (patch) | |
tree | 5ea60bd475891efacdd8b328c23ec2536cacff88 /config.txt | |
parent | ce5b8accea74b2c2263a82939a32f6ddb2bffc4e (diff) | |
download | git-htmldocs-58f587aef6ee6b6b759fe8f4dd500f471eee1b88.tar.gz |
Autogenerated HTML docs for v1.8.3.4-837-g0bde8
Diffstat (limited to 'config.txt')
-rw-r--r-- | config.txt | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/config.txt b/config.txt index 81856dd5a..e0b923f42 100644 --- a/config.txt +++ b/config.txt @@ -879,16 +879,17 @@ The values of these variables may be specified as in color.branch.<slot>. color.interactive:: When set to `always`, always use colors for interactive prompts - and displays (such as those used by "git-add --interactive"). - When false (or `never`), never. When set to `true` or `auto`, use - colors only when the output is to the terminal. Defaults to false. + and displays (such as those used by "git-add --interactive" and + "git-clean --interactive"). When false (or `never`), never. + When set to `true` or `auto`, use colors only when the output is + to the terminal. Defaults to false. color.interactive.<slot>:: - Use customized color for 'git add --interactive' - output. `<slot>` may be `prompt`, `header`, `help` or `error`, for - four distinct types of normal output from interactive - commands. The values of these variables may be specified as - in color.branch.<slot>. + Use customized color for 'git add --interactive' and 'git clean + --interactive' output. `<slot>` may be `prompt`, `header`, `help` + or `error`, for four distinct types of normal output from + interactive commands. The values of these variables may be + specified as in color.branch.<slot>. color.pager:: A boolean to enable/disable colored output when the pager is in @@ -973,6 +974,10 @@ column.branch:: Specify whether to output branch listing in `git branch` in columns. See `column.ui` for details. +column.clean:: + Specify the layout when list items in `git clean -i`, which always + shows files and directories in columns. See `column.ui` for details. + column.status:: Specify whether to output untracked files in `git status` in columns. See `column.ui` for details. @@ -2068,6 +2073,10 @@ sendemail.smtpencryption:: sendemail.smtpssl:: Deprecated alias for 'sendemail.smtpencryption = ssl'. +sendemail.smtpsslcertpath:: + Path to ca-certificates (either a directory or a single file). + Set it to an empty string to disable certificate verification. + sendemail.<identity>.*:: Identity-specific versions of the 'sendemail.*' parameters found below, taking precedence over those when the this |