author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
Wed, 9 Aug 2006 13:04:16 +0000 (15:04 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 9 Aug 2006 21:46:47 +0000 (14:46 -0700) | ||
commit | 5b982f84ee6eb3027e5bdf2e917a0efa48aded6a | |
tree | 59d899f5b77b4f5d9a897218f1d8988376e3940d | tree | snapshot |
parent | 3d234d0afacd355eb30b330a56bd2efa73bd44d5 | commit | diff |
merge-recur: do not call git-write-tree
Since merge-recur is in C, and uses libgit, it can call the relevant
functions directly, without writing the index file.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Since merge-recur is in C, and uses libgit, it can call the relevant
functions directly, without writing the index file.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive.c | diff | blob | history |