summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Nicolas Pitre <nico@cam.org>2008-12-11 15:36:47 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-12-12 19:47:36 -0800
commit43cc2b4266cc75f1a5a10e1a805d05e419000573 (patch)
treef2efb709d61fc55e243f37718bfa2649c2e4892a /builtin-merge-ours.c
parentMerge branch 'maint' (diff)
downloadtgif-43cc2b4266cc75f1a5a10e1a805d05e419000573.tar.xz
autodetect number of CPUs by default when using threads
... and display the actual number of threads used when locally repacking. A remote server still won't tell you how many threads it uses during a fetch though. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions