aboutsummaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorNguyen Thai Ngoc Duy <pclouds@gmail.com>2012-10-10 20:55:52 +0700
committerJunio C Hamano <gitster@pobox.com>2012-10-10 11:09:20 -0700
commit40701adbcbbc1e3e4485562a36343f4781e62be5 (patch)
tree09e5c4b3af7b9595861cb54a46d1aa2183ff9746 /mergetools
parent7bfffdc8a0039ebb1af36b62634697638f3b1ea5 (diff)
downloadgit-40701adbcbbc1e3e4485562a36343f4781e62be5.tar.gz
git-40701adbcbbc1e3e4485562a36343f4781e62be5.tar.xz
attr: a note about the order of .gitattributes lookup
This is the documentation part of 1a9d7e9 (attr.c: read .gitattributes from index as well. - 2007-08-14) 06f33c1 (Read attributes from the index that is being checked out - 2009-03-13) Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions