diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-16 15:22:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 15:22:05 -0700 |
| commit | 2de3db2f3855f3470d8ba4daf150e1491ca6169c (patch) | |
| tree | 5e34cfebbda00baf9f0fcac28024b6c467543640 /builtin-merge-ours.c | |
| parent | rebase-i: keep old parents when preserving merges (diff) | |
| parent | git daemon: avoid calling syslog() from a signal handler (diff) | |
| download | tgif-2de3db2f3855f3470d8ba4daf150e1491ca6169c.tar.xz | |
Merge branch 'js/maint-daemon-syslog' into maint
* js/maint-daemon-syslog:
git daemon: avoid calling syslog() from a signal handler
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions