diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2011-12-06 21:43:39 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-07 03:13:39 +0400 |
| commit | 6c52ec8a9ab48b50fc8bf9559467d5a4cf7eee3b (patch) | |
| tree | 276dfba73bd613d45c703e33ccffdc09cad7524d /merge-recursive.c | |
| parent | 11c8a74a64a49f236d475514f723123a8928463d (diff) | |
reset: update cache-tree data when appropriate
In the case of --mixed and --hard, we throw away the old index and
rebuild everything from the tree argument (or HEAD). So we have an
opportunity here to fill in the cache-tree data, just as read-tree
did.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions