author | Junio C Hamano <gitster@pobox.com> | |
Wed, 22 Dec 2010 00:46:52 +0000 (16:46 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 22 Dec 2010 00:46:52 +0000 (16:46 -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
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 | patch | | diff1 | | diff2 | | blob | history |
cache.h | patch | | diff1 | | diff2 | | blob | history |
dir.c | patch | | diff1 | | diff2 | | blob | history |
dir.h | patch | | diff1 | | diff2 | | blob | history |
t/t1011-read-tree-sparse-checkout.sh | patch | | diff1 | | diff2 | | blob | history |
unpack-trees.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-read-tree.txt
Simple merge
diff --cc cache.h
Simple merge
diff --cc dir.c
Simple merge
diff --cc dir.h
Simple merge
diff --cc t/t1011-read-tree-sparse-checkout.sh
Simple merge
diff --cc unpack-trees.c
Simple merge