Merge branch 'jc/symref' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 3 May 2006 05:04:34 +0000 (22:04 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 3 May 2006 05:04:34 +0000 (22:04 -0700)
* jc/symref:
  core.prefersymlinkrefs: use symlinks for .git/HEAD

1  2 
Makefile
cache.h

diff --cc Makefile
Simple merge
diff --cc cache.h
Simple merge