Merge branch 'jc/gitlink' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 7 May 2006 23:17:43 +0000 (16:17 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 7 May 2006 23:17:43 +0000 (16:17 -0700)
* jc/gitlink:
  write-tree: --prefix=<path>
  read-tree: --prefix=<path>/ option.

1  2 
cache-tree.c
read-tree.c

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