summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar John Chapman <thestar@fussycoder.id.au>2008-11-08 14:22:49 +1100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-11-11 14:50:03 -0800
commit36bd844658cf244ec2c6756c18673a4b7ed8ec9e (patch)
tree7476047334482bc81b24bca511023a553e7d79be /builtin-merge-ours.c
parentgit-p4: Support purged files and optimize memory usage (diff)
downloadtgif-36bd844658cf244ec2c6756c18673a4b7ed8ec9e.tar.xz
git-p4: Cache git config for performance
This makes git-p4 noticibly faster on Windows. Signed-off-by: John Chapman <thestar@fussycoder.id.au> Acked-by: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions