diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 11:23:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 11:23:28 -0700 |
| commit | 3f6f5c9dbe764c5100e6b48a0081b022983f49e8 (patch) | |
| tree | 967471d7c744c3f58b7f77aef587ac5da8512b61 /diff.c | |
| parent | c97418466a06c31edca53995cf82f644851640b1 (diff) | |
| parent | 5ee875852e3cb41c21c2e89a636fc1e40c4012b1 (diff) | |
| download | git-3f6f5c9dbe764c5100e6b48a0081b022983f49e8.tar.gz | |
Merge branch 'jc/decorate-leaky-separator-color' into maint
"git log --decorate" did not reset colors correctly around the
branch names.
* jc/decorate-leaky-separator-color:
log --decorate: do not leak "commit" color into the next item
Documentation/config.txt: simplify boolean description in the syntax section
Documentation/config.txt: describe 'color' value type in the "Values" section
Documentation/config.txt: have a separate "Values" section
Documentation/config.txt: describe the structure first and then meaning
Documentation/config.txt: explain multi-valued variables once
Documentation/config.txt: avoid unnecessary negation
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions