From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 30 Aug 2008 15:17:15 +0000 (-0700)
Subject: Merge branch 'sb/daemon'
X-Git-Tag: v1.6.1-rc1~284
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff1e8bfcd69e5e0ee1a3167e80ef75b611f72123;p=git.git

Merge branch 'sb/daemon'

* sb/daemon:
  daemon.c: minor style fixup
  git-daemon: rewrite kindergarden, new option --max-connections
  git-daemon: Simplify dead-children reaping logic
  git-daemon: use LOG_PID, simplify logging code
  git-daemon: call logerror() instead of error()
---

ff1e8bfcd69e5e0ee1a3167e80ef75b611f72123