Merge branch 'ap/status-ignored-in-ignored-directory' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:10:25 +0000 (11:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:10:25 +0000 (11:10 -0800)
commit85fd059...89c7328ca37edd31f2d8daa4d0d61de5
treeaf771f6...56d0a225b171878719f67ceb0c02031dcopy hash to clipboard (tree)
parent3a51e4b...9c3910ce0b81de5eb1b7f4a16994fc78copy hash to clipboard (diff)
parenta45fb69...f13bb789aca930ce786cf416ef1ecd0ecopy hash to clipboard (diff)
dir.c
wt-status.c