[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69d830d 4170af8)
Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 21 Jun 2006 08:24:45 +0000 (01:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Jun 2006 08:24:45 +0000 (01:24 -0700)
* master:
  checkout -f: do not leave untracked working tree files.
  Log peer address when git-daemon called from inetd

1  2 
daemon.c patch | diff1 | diff2 | blob | history

diff --cc daemon.c
Simple merge
Git - the stupid content tracker