Merge branch 'jc/decorate-leaky-separator-color' into HEAD
commit4ab682e213d292fb921d21d25208a74ce47e2c19
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Mar 2015 22:17:37 +0000 (10 15:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Mar 2015 22:17:37 +0000 (10 15:17 -0700)
treed095749420ea7ee4ad09a91fc260121985db7e6d
parent1165ae6f3d42e0eb0ddfc2d4e6dfa8bd0b88eb60
parent5ee875852e3cb41c21c2e89a636fc1e40c4012b1
Merge branch 'jc/decorate-leaky-separator-color' into HEAD

* 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
Documentation/config.txt
log-tree.c