summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-26 11:25:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-26 11:25:59 -0700
commit7a011aac0ef32e1b4835284c3ca6360729d7b83b (patch)
treeb5ed4a96ce170574b07ea9178ad90b44afe09ef7 /merge-recursive.h
parentMerge branch 'jn/gitweb-install-doc' into maint (diff)
parentrun-command: use thread-aware die_is_recursing routine (diff)
downloadtgif-7a011aac0ef32e1b4835284c3ca6360729d7b83b.tar.xz
Merge branch 'jk/a-thread-only-dies-once' into maint
* jk/a-thread-only-dies-once: run-command: use thread-aware die_is_recursing routine usage: allow pluggable die-recursion checks
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions