Junio C Hamano 4f7a3b9117 Merge branch 'nd/fix-sparse-checkout' into next ...

* 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

2010-08-12 18:35:19 -07:00

38 KiB

Raw Blame History

View Raw