Merge branch 'rs/simplify-config-include'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:36 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:36 +0000 (11:38 -0700)
commit56bee64...0c08705de1c1017558190cccd5389bca
treee0d1712...d5d4148a7146ec17b6d0cfb955f81ed5copy hash to clipboard (tree)
parent7669461...59aaee1587bac77c4a446e9365b582c7copy hash to clipboard (diff)
parent37007c3...87f3d78f533533f96a0d49bd0d520671copy hash to clipboard (diff)
config.c