diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-28 22:41:57 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-28 22:41:57 +0300 |
| commit | dc05d73104fda239fc03342e0b53aa5741c53531 (patch) | |
| tree | ae0b14cc4f36582fc4b4668c0ebe67864b800c4f /Documentation/config.txt | |
| parent | d32fad2b89c81ca29128722e0e2f5985426e5e7a (diff) | |
| parent | c5e5f6030573b5433284b4e6b4342ab7204f20e1 (diff) | |
Merge branch 'maint'
* maint:
Git 1.7.0.1
Remove reference to GREP_COLORS from documentation
sha1_name: fix segfault caused by invalid index access
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 664de6b1ab..7103172ed3 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -685,9 +685,7 @@ color.grep:: color.grep.match:: Use customized color for matches. The value of this variable - may be specified as in color.branch.<slot>. It is passed using - the environment variables 'GREP_COLOR' and 'GREP_COLORS' when - calling an external 'grep'. + may be specified as in color.branch.<slot>. color.interactive:: When set to `always`, always use colors for interactive prompts |