summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-08-05 22:27:43 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-15 20:00:03 -0700
commit3668d4238314dc5db98de3034058f68ff57a6b1e (patch)
treea7d5c5494e53eeeb7a2c8fc4a93dbd181cbcef59 /merge-file.c
parentvar: run setup_git_directory_gently() sooner (diff)
downloadtgif-3668d4238314dc5db98de3034058f68ff57a6b1e.tar.xz
merge-file: run setup_git_directory_gently() sooner
Part of a campaign to make repository-local configuration available early (simplifying the startup sequence for built-in commands). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions