Merge branch 'jk/a-thread-only-dies-once' into maint
commit7a011aac0ef32e1b4835284c3ca6360729d7b83b
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 18:25:59 +0000 (26 11:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 18:25:59 +0000 (26 11:25 -0700)
treeb5ed4a96ce170574b07ea9178ad90b44afe09ef7
parent40a9c3c9a0328f9b11b1fe5980888d509f26be4f
parent1ece66bc9e5433dff008786daba9918f3e2a6525
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
git-compat-util.h
run-command.c
usage.c