summaryrefslogtreecommitdiff
path: root/contrib/hooks
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-13 21:24:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-13 22:51:43 -0700
commit06f33c1735bf76e02f3e2601cde5161e969872a7 (patch)
tree3cff780e24ab8b9b1d63a462148d44216ebdc498 /contrib/hooks
parentMerge branch 'maint' (diff)
downloadtgif-06f33c1735bf76e02f3e2601cde5161e969872a7.tar.xz
Read attributes from the index that is being checked out
Traditionally we used .gitattributes file from the work tree if exists, and otherwise read from the index as a fallback. When switching to a branch that has an updated .gitattributes file, and entries in it give different attributes to other paths being checked out, we should instead read from the .gitattributes in the index. This breaks a use case of fixing incorrect entries in the .gitattributes in the work tree (without adding it to the index) and checking other paths out, though. $ edit .gitattributes ;# mark foo.dat as binary $ rm foo.dat $ git checkout foo.dat Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/hooks')
0 files changed, 0 insertions, 0 deletions