summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-06 11:39:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-06 11:39:01 -0700
commitbdebbeb3346e9867005947aff356b99a7358e5ab (patch)
tree36d4dc9b1776fef1794432de7dd0c3a50793a9e1 /git-merge-resolve.sh
parentMerge branch 'ss/receive-pack-parse-options' (diff)
parentclone: allow an explicit argument for parallel submodule clones (diff)
downloadtgif-bdebbeb3346e9867005947aff356b99a7358e5ab.tar.xz
Merge branch 'sb/submodule-parallel-update'
A major part of "git submodule update" has been ported to C to take advantage of the recently added framework to run download tasks in parallel. * sb/submodule-parallel-update: clone: allow an explicit argument for parallel submodule clones submodule update: expose parallelism to the user submodule helper: remove double 'fatal: ' prefix git submodule update: have a dedicated helper for cloning run_processes_parallel: rename parameters for the callbacks run_processes_parallel: treat output of children as byte array submodule update: direct error message to stderr fetching submodules: respect `submodule.fetchJobs` config option submodule-config: drop check against NULL submodule-config: keep update strategy around
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions