| commit | 6511cce24b932eba33d8e13b54664673121a8b7e | |
| author | Fredrik Kuivinen <freku045@student.liu.se> | |
| Tue, 13 Sep 2005 21:41:16 +0000 (13 23:41 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 13 Sep 2005 22:45:25 +0000 (13 15:45 -0700) | ||
| tree | f3c477670b0fa7dd3fc9738b08e7e7b3f7ae1d63 | treesnapshot (tar.gz zip) |
| parent | 87a71b65acc10c4879b13d2030185e5640a087cd | commitdiff |
[PATCH] Use a temporary index file when we merge the common ancestors.
With this change we can get rid of a call to 'git-update-index
--refresh'.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
With this change we can get rid of a call to 'git-update-index
--refresh'.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-recursive.py | diffblobblamehistory |