Merge branch 'mg/doc-status-color-slot'
commit2a39bdb9a163f9f4ad11599dbeca87445eecb7d8
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2015 23:01:34 +0000 (17 16:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2015 23:01:34 +0000 (17 16:01 -0700)
tree4b76762cbff4f9da95da827c6229a89574d80004
parent9bb56e47532db6fb7e97020ffa247ad5c54b1726
parent0d6accc01d4073d685ece5ba9fd0a439539a5a02
Merge branch 'mg/doc-status-color-slot'

Documentation fixes.

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