Merge branch 'nd/conditional-config-include'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:07:18 +0000 (15:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:07:18 +0000 (15:07 -0700)
commit4b7989b...0321e5558fc00c93408c6631f9fc604d
treeb19ceef...48a6476d1756d976ef9b7b093f81276fcopy hash to clipboard (tree)
parent45cbc37...5f84fadd78cccf6b2ea82a9ef251cdc6copy hash to clipboard (diff)
parent3efd0be...c6625a6b194c1f6e5f1b7aa7d8b7e6bbcopy hash to clipboard (diff)
Documentation/config.txt
config.c