diff options
author | Junio C Hamano <junkio@cox.net> | 2006-09-18 05:14:03 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-09-18 05:14:03 +0400 |
commit | b467fb0b909883f28c4653361ccfa530ccf1a03e (patch) | |
tree | a84b4c34ef9cbf3e342a81ae14e7009a908cf2c7 /Documentation | |
parent | ac8e3f2bb8a790ca7810df18c3282d07e84ae345 (diff) | |
parent | db830b4f233bd45e28592fbf59395bc98d79dec5 (diff) |
Merge branch 'jk/diff'
* jk/diff:
wt-status: remove extraneous newline from 'deleted:' output
git-status: document colorization config options
Teach runstatus about --untracked
git-commit.sh: convert run_status to a C builtin
Move color option parsing out of diff.c and into color.[ch]
diff: support custom callbacks for output
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/config.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ce722a2db0..844cae4cf0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -225,6 +225,20 @@ showbranch.default:: The default set of branches for gitlink:git-show-branch[1]. See gitlink:git-show-branch[1]. +status.color:: + A boolean to enable/disable color in the output of + gitlink:git-status[1]. May be set to `true` (or `always`), + `false` (or `never`) or `auto`, in which case colors are used + only when the output is to a terminal. Defaults to false. + +status.color.<slot>:: + Use customized color for status colorization. `<slot>` is + one of `header` (the header text of the status message), + `updated` (files which are updated but not committed), + `changed` (files which are changed but not updated in the index), + or `untracked` (files which are not tracked by git). The values of + these variables may be specified as in diff.color.<slot>. + tar.umask:: By default, gitlink:git-tar-tree[1] sets file and directories modes to 0666 or 0777. While this is both useful and acceptable for projects |