Merge branch 'jc/rw-prefix'
commit75c3a5ccdf114b5485e4828db1923bf4a35b19e2
authorJunio C Hamano <junkio@cox.net>
Sun, 18 Jun 2006 00:56:52 +0000 (17 17:56 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 18 Jun 2006 00:56:52 +0000 (17 17:56 -0700)
treee919c376fa68f0ce8b46918b499d8ed8516c048a
parent8c278abcbe35b23e9f93e99daf2144336fad1849
parentd6970e42a1763b549ccf93558de7f54a78819d7a
Merge branch 'jc/rw-prefix'

* jc/rw-prefix:
  read-tree: reorganize bind_merge code.
  write-tree: --prefix=<path>
  read-tree: --prefix=<path>/ option.
Documentation/git-read-tree.txt
builtin-read-tree.c
cache-tree.c
write-tree.c