diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-14 07:32:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-14 07:32:25 -0800 |
| commit | 659742f796b5502e3917fbdbd1d7400c9648b180 (patch) | |
| tree | 981af89e83e9e8dd0d2b89e813f17bc708a5c26e /xdiff/xmerge.c | |
| parent | Merge branch 'mk/maint-graph-infinity-loop' into maint (diff) | |
| parent | fix compilation with NO_PTHREADS (diff) | |
| download | tgif-659742f796b5502e3917fbdbd1d7400c9648b180.tar.xz | |
Merge branch 'pf/editor-ignore-sigint' into maint
The behaviour visible to the end users was confusing, when they
attempt to kill a process spawned in the editor that was in turn
launched by Git with SIGINT (or SIGQUIT), as Git would catch that
signal and die. We ignore these signals now.
* pf/editor-ignore-sigint:
fix compilation with NO_PTHREADS
launch_editor: propagate signals from editor to git
run-command: do not warn about child death from terminal
launch_editor: ignore terminal signals while editor has control
launch_editor: refactor to use start/finish_command
run-command: drop silent_exec_failure arg from wait_or_whine
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions