Merge branch 'jk/colors-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:16:58 +0000 (12:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:16:58 +0000 (12:16 -0800)
commit5d509d5...1cf1feb9e218b431f4ea41b10e39d06e
tree7c40aab...32458afa6500d585abff62acf4163b5dcopy hash to clipboard (tree)
parent447c39a...b25e222a96711f7736078e4f33001388copy hash to clipboard (diff)
parentcb35722...a402c55b23bf99ec9f3b361709d45fa7copy hash to clipboard (diff)
Documentation/config.txt
builtin/config.c