![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Aug 2010 06:28:05 +0000 (23:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Aug 2010 06:28:05 +0000 (23:28 -0700) | ||
| commit | c3b9325fa699dfa2562ac3748d14f082646979c2 | |
| tree | c197983f06ce6e56980845e707361463dbfd3278 | tree | snapshot |
| parent | 2d984464c6be7ced6772a8dcf95d6a461a659a78 | commit | diff |
| parent | 74da98f9c761b2e63366a643fa52749844ddc6a1 | commit | diff |
Merge branch 'nd/fix-sparse-checkout'
* nd/fix-sparse-checkout:
unpack-trees: mark new entries skip-worktree appropriately
unpack-trees: do not check for conflict entries too early
unpack-trees: let read-tree -u remove index entries outside sparse area
unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
t1011 (sparse checkout): style nitpicks
* nd/fix-sparse-checkout:
unpack-trees: mark new entries skip-worktree appropriately
unpack-trees: do not check for conflict entries too early
unpack-trees: let read-tree -u remove index entries outside sparse area
unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
t1011 (sparse checkout): style nitpicks
| cache.h | diff1 | | diff2 | | blob | history |
| unpack-trees.c | diff1 | | diff2 | | blob | history |