diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 12:16:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-05 12:16:32 -0700 |
| commit | 6e7c92a91d2706ddd9955cb9807b65a63b0bbfdf (patch) | |
| tree | 52d88d92fd9f827e1e4aa9ee6a798cbf704c104d /merge-cache.c | |
| parent | git-apply: first cut at actually checking fragment data (diff) | |
| download | tgif-6e7c92a91d2706ddd9955cb9807b65a63b0bbfdf.tar.xz | |
git-apply: find offset fragments, and really apply them
This applies the fragments in memory, but doesn't actually
write the results out to the files yet. But we now do all the
difficult parts, the rest is just basically writing the
results out and updating the index.
Diffstat (limited to 'merge-cache.c')
0 files changed, 0 insertions, 0 deletions