diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-27 01:37:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-27 01:37:03 -0700 |
| commit | 70b1fb23e29a909883c4a1b452610e5b1aa414a6 (patch) | |
| tree | fd1574ac77578e05b9e2c52036f10559e5602052 /combine-diff.c | |
| parent | Merge branch 'jc/cache-tree' into next (diff) | |
| parent | read-tree: teach 1-way merege and plain read to prime cache-tree. (diff) | |
| download | tgif-70b1fb23e29a909883c4a1b452610e5b1aa414a6.tar.xz | |
Merge branch 'jc/cache-tree' into next
* jc/cache-tree:
read-tree: teach 1-way merege and plain read to prime cache-tree.
read-tree: teach 1 and 2 way merges about cache-tree.
update-index: when --unresolve, smudge the relevant cache-tree entries.
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions