summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Kristian Amlie <kristian.amlie@nokia.com>2009-03-20 10:32:09 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-20 09:36:16 -0700
commitb997045e01c2f12ac7dc44c487915f8e50da4d4d (patch)
treeb7f67d4dd07f25d263ce8a829c03e486b79c49f0 /merge-index.c
parentRead attributes from the index that is being checked out (diff)
downloadtgif-b997045e01c2f12ac7dc44c487915f8e50da4d4d.tar.xz
Add a test for checking whether gitattributes is honored by checkout.
The original bug will not honor new entries in gitattributes if they are changed in the same checkout as the files they affect. It will also keep using .gitattributes, even if it is deleted in the same commit as the files it affects. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions