Merge branch 'jc/racy'
authorJunio C Hamano <junkio@cox.net>
Wed, 16 Aug 2006 21:00:34 +0000 (14:00 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 16 Aug 2006 21:00:34 +0000 (14:00 -0700)
* jc/racy:
  Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
  Add check program "git-check-racy"
  Documentation/technical/racy-git.txt
  avoid nanosleep(2)

1  2 
Makefile
read-cache.c

diff --cc Makefile
Simple merge
diff --cc read-cache.c
Simple merge