Merge branch 'mg/doc-status-color-slot' into maint
commitffac6258de4f72e06b6b2e412deffb00a1abb339
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2015 18:23:30 +0000 (23 11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2015 18:23:31 +0000 (23 11:23 -0700)
treeecd845244f27808535b8d0d062379d03874b2e03
parent3f6f5c9dbe764c5100e6b48a0081b022983f49e8
parent0d6accc01d4073d685ece5ba9fd0a439539a5a02
Merge branch 'mg/doc-status-color-slot' into maint

Documentation fixes.

* mg/doc-status-color-slot:
  config,completion: add color.status.unmerged
Documentation/config.txt