]> git.ipfire.org Git - thirdparty/git.git/commit - unpack-trees.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 16da134) | patch
read-tree: move merge functions to the library
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Sun, 30 Jul 2006 18:26:15 +0000 (20:26 +0200)
committerJunio C Hamano <junkio@cox.net>
Mon, 31 Jul 2006 06:31:39 +0000 (23:31 -0700)
commit076b0adcf9dac7bd9d18624087f679cc811aeb77
tree99b9d07f74b648b5353a56350247b929efa7acdetree | snapshot
parent16da134b1f9b0fbd1d328999875d34d02e5470b4commit | diff
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>
builtin-read-tree.c diff | blob | blame | history
unpack-trees.c diff | blob | blame | history
unpack-trees.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.