summaryrefslogtreecommitdiff
path: root/receive-pack.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-30 20:26:15 +0200
committerJunio C Hamano <junkio@cox.net>2006-07-30 23:31:39 -0700
commit076b0adcf9dac7bd9d18624087f679cc811aeb77 (patch)
tree99b9d07f74b648b5353a56350247b929efa7acde /receive-pack.c
parent16da134b1f9b0fbd1d328999875d34d02e5470b4 (diff)
downloadgit-076b0adcf9dac7bd9d18624087f679cc811aeb77.tar.gz
read-tree: move merge functions to the library
This will allow merge-recursive to use the read-tree functionality without exec()ing git-read-tree. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'receive-pack.c')
0 files changed, 0 insertions, 0 deletions