![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 18 Apr 2005 21:17:58 +0000 (14:17 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 18 Apr 2005 21:17:58 +0000 (14:17 -0700) | ||
| commit | e3b4be7f6c31d85b5f6abc42bd24d61bce5027b4 | |
| tree | a1fc4f22ab9c7065f86046a81716ada8f9df5080 | tree | snapshot |
| parent | 3407bb4940c25ca67c846a48ef2c2c60c02178e0 | commit | diff |
Change merge-cache and git-merge-one-file to use the SHA1 of the file
instead of a checked-out temporary copy.
If merging requires a checked-out-copy, we now do so with "unpack-file".
instead of a checked-out temporary copy.
If merging requires a checked-out-copy, we now do so with "unpack-file".
| git-merge-one-file-script | diff | blob | history | |
| merge-cache.c | diff | blob | history |