diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-02 13:20:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-02 13:20:29 -0800 |
| commit | 5816d3cdfbfbeb5d173114ed08ab5c04c63207a6 (patch) | |
| tree | 9dd715cb97d94c144e10bd7aef47d69eedf668c2 /merge-recursive.c | |
| parent | Ready for 2.11.1 (diff) | |
| parent | execv_dashed_external: wait for child on signal death (diff) | |
| download | tgif-5816d3cdfbfbeb5d173114ed08ab5c04c63207a6.tar.xz | |
Merge branch 'jk/execv-dashed-external' into maint
Typing ^C to pager, which usually does not kill it, killed Git and
took the pager down as a collateral damage in certain process-tree
structure. This has been fixed.
* jk/execv-dashed-external:
execv_dashed_external: wait for child on signal death
execv_dashed_external: stop exiting with negative code
execv_dashed_external: use child_process struct
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions