Merge branch 'master' into next
commitad9f72a7042e22d871c7c6441e8b220b7142d40f
authorJunio C Hamano <junkio@cox.net>
Wed, 21 Jun 2006 08:24:45 +0000 (21 01:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Jun 2006 08:24:45 +0000 (21 01:24 -0700)
treee8406e084272930a6c2cfb6c8452ad55d29aa1a5
parent69d830d1a3a1236036bd0f84dd9794d7c8d34b3f
parent4170af82328e50a75723cee084ae779e7a882b9d
Merge branch 'master' into next

* master:
  checkout -f: do not leave untracked working tree files.
  Log peer address when git-daemon called from inetd
daemon.c