]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'nd/maint-fix-add-typo-detection'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 22:40:26 +0000 (14:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 22:40:26 +0000 (14:40 -0800)
* 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

1  2 
Documentation/git-read-tree.txt
cache.h
dir.c
dir.h
t/t1011-read-tree-sparse-checkout.sh
unpack-trees.c

Simple merge
diff --cc cache.h
Simple merge
diff --cc dir.c
Simple merge
diff --cc dir.h
Simple merge
Simple merge
diff --cc unpack-trees.c
Simple merge