From: Junio C Hamano Date: Wed, 21 Jun 2006 08:24:45 +0000 (-0700) Subject: Merge branch 'master' into next X-Git-Tag: v1.4.1-rc1~10 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ad9f72a7042e22d871c7c6441e8b220b7142d40f Merge branch 'master' into next * master: checkout -f: do not leave untracked working tree files. Log peer address when git-daemon called from inetd --- ad9f72a7042e22d871c7c6441e8b220b7142d40f