Merge branch 'dt/untracked-sparse'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Aug 2015 22:07:52 +0000 (15:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Aug 2015 22:07:52 +0000 (15:07 -0700)
Allow untracked cache (experimental) to be used when sparse
checkout (experimental) is also in use.

* dt/untracked-sparse:
untracked-cache: support sparse checkout

1  2 
dir.c
diff --cc dir.c
Simple merge