]> git.ipfire.org Git - thirdparty/git.git/commit - git-merge-one-file-script
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3407bb4) | patch
Change merge-cache and git-merge-one-file to use the SHA1 of the file
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Apr 2005 21:17:58 +0000 (14:17 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Apr 2005 21:17:58 +0000 (14:17 -0700)
commite3b4be7f6c31d85b5f6abc42bd24d61bce5027b4
treea1fc4f22ab9c7065f86046a81716ada8f9df5080tree | snapshot
parent3407bb4940c25ca67c846a48ef2c2c60c02178e0commit | 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".
git-merge-one-file-script diff | blob | blame | history
merge-cache.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.