From: Junio C Hamano Date: Wed, 22 Dec 2010 22:40:26 +0000 (-0800) Subject: Merge branch 'nd/maint-fix-add-typo-detection' X-Git-Tag: v1.7.4-rc0~12 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e39212ab08e8d37dda5d8fd32b54099fe01dbbdb;p=git.git Merge branch 'nd/maint-fix-add-typo-detection' * nd/maint-fix-add-typo-detection: Revert "excluded_1(): support exclude files in index" unpack-trees: fix sparse checkout's "unable to match directories" unpack-trees: move all skip-worktree checks back to unpack_trees() dir.c: add free_excludes() cache.h: realign and use (1 << x) form for CE_* constants --- e39212ab08e8d37dda5d8fd32b54099fe01dbbdb