Merge branch 'ml/color-when'

* ml/color-when:
  Add an optional argument for --color options
This commit is contained in:
Junio C Hamano
2010-03-02 12:44:06 -08:00
12 changed files with 66 additions and 11 deletions

View File

@ -115,6 +115,9 @@ There are some macros to easily define options:
`OPT__ABBREV(&int_var)`::
Add `\--abbrev[=<n>]`.
`OPT__COLOR(&int_var, description)`::
Add `\--color[=<when>]` and `--no-color`.
`OPT__DRY_RUN(&int_var)`::
Add `-n, \--dry-run`.
@ -183,6 +186,15 @@ There are some macros to easily define options:
arguments. Short options that happen to be digits take
precedence over it.
`OPT_COLOR_FLAG(short, long, &int_var, description)`::
Introduce an option that takes an optional argument that can
have one of three values: "always", "never", or "auto". If the
argument is not given, it defaults to "always". The `--no-` form
works like `--long=never`; it cannot take an argument. If
"always", set `int_var` to 1; if "never", set `int_var` to 0; if
"auto", set `int_var` to 1 if stdout is a tty or a pager,
0 otherwise.
The last element of the array must be `OPT_END()`.