Merge branch 'fc/branch-upstream-color' into next
commit2fc50fdae42a405b2c35df65d5fe324e0ee8ed19
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2013 19:50:07 +0000 (15 12:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Apr 2013 19:50:07 +0000 (15 12:50 -0700)
tree8605514d0861e62e14f5750d04ab4e6c6d7f9ffc
parentf062dc6784c3523017a67247397eede0025e4e92
parentdbda21fa87c1c5495c2f8ced4c40d7dbfa1cdcc2
Merge branch 'fc/branch-upstream-color' into next

Add more colors to "git branch -vv" output.

* fc/branch-upstream-color:
  branch: colour upstream branches
Documentation/config.txt