Merge branch 'jc/ls-files-i-dir' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:44:34 +0000 (12:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:44:35 +0000 (12:44 -0700)
commitcd733f4...713d46bc175fd57fc9a168ea4f846148
tree55214b4...5870898162163c45daecf651d14a826ccopy hash to clipboard (tree)
parentfb60f34...e441788040dbeec8f85ccd826ceaacd1copy hash to clipboard (diff)
parent0d316f0...eff1c416c25327f40bc5fbdded98a01acopy hash to clipboard (diff)
builtin/add.c
dir.c
dir.h
unpack-trees.c