summaryrefslogtreecommitdiff
path: root/builtin/commit-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-21 15:07:18 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-21 15:07:18 -0700
commit4b7989b10321e5558fc00c93408c6631f9fc604d (patch)
treeb19ceef948a6476d1756d976ef9b7b093f81276f /builtin/commit-tree.c
parent45cbc37c5f84fadd78cccf6b2ea82a9ef251cdc6 (diff)
parent3efd0bedc6625a6b194c1f6e5f1b7aa7d8b7e6bb (diff)
downloadgit-4b7989b10321e5558fc00c93408c6631f9fc604d.tar.gz
Merge branch 'nd/conditional-config-include'
The configuration file learned a new "includeIf.<condition>.path" that includes the contents of the given path only when the condition holds. This allows you to say "include this work-related bit only in the repositories under my ~/work/ directory". * nd/conditional-config-include: config: add conditional include config.txt: reflow the second include.path paragraph config.txt: clarify multiple key values in include.path
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions