Merge branch 'jc/decorate-leaky-separator-color'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2015 20:50:51 +0000 (13:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2015 20:50:51 +0000 (13:50 -0700)
commit5f456b3c2612dce9cbc3ba4864dd0e5fdf429cac
treed4d7fd402a8490ab4c61a4eff9ba8f054395f0cb
parentcfe96b38fddc114c0bc98bbeab51b0f18fd102c3
parent5ee875852e3cb41c21c2e89a636fc1e40c4012b1
Merge branch 'jc/decorate-leaky-separator-color'

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