diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 21:17:58 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 21:17:58 (GMT) |
| commit | e3b4be7f6c31d85b5f6abc42bd24d61bce5027b4 (patch) | |
| tree | a1fc4f22ab9c7065f86046a81716ada8f9df5080 /show-diff.c | |
| parent | 3407bb4940c25ca67c846a48ef2c2c60c02178e0 (diff) | |
| download | git-e3b4be7f6c31d85b5f6abc42bd24d61bce5027b4.zip git-e3b4be7f6c31d85b5f6abc42bd24d61bce5027b4.tar.gz git-e3b4be7f6c31d85b5f6abc42bd24d61bce5027b4.tar.bz2 | |
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".
Diffstat (limited to 'show-diff.c')
0 files changed, 0 insertions, 0 deletions