Merge branch 'nd/conditional-config-include'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Apr 2017 05:07:46 +0000 (22:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Apr 2017 05:07:46 +0000 (22:07 -0700)
commita2e2c04...833be53e7599ee7fed5c45f16580ab37
tree0ea4faa...2f6b99ac0cbbfebdd1e4f35ac7eff622copy hash to clipboard (tree)
parent4c01f67...9102942cc7f0a737de4c609a6ac1832ecopy hash to clipboard (diff)
parent86f9515...0839e241cfa8effbe195674193693a7fcopy hash to clipboard (diff)
builtin/commit.c
builtin/config.c
cache.h
config.c
credential-cache.c
path.c