summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-09-12 20:24:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-13 15:45:45 -0700
commit7c0a842b46391230661d17ad758efa6b4eccdb93 (patch)
tree59926a9fbc10297842b413fa6b8758a2fc1860cc /builtin/merge-file.c
parentconfig: only read .git/config from configured repos (diff)
downloadtgif-7c0a842b46391230661d17ad758efa6b4eccdb93.tar.xz
init: expand comments explaining config trickery
git-init may copy "config" from the templates directory and then re-read it. There are some comments explaining what's going on here, but they are not grouped very well with the matching code. Let's rearrange and expand them. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions