summaryrefslogtreecommitdiff
path: root/branch.c
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2011-10-16 10:45:01 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-17 20:46:49 -0700
commit9cffb8c8bfd64d97769b3e3792201bcb3618dd23 (patch)
tree23fa5070c8d9f15d14ac0b3c269c2248be21f0dc /branch.c
parentgit-p4: handle utf16 filetype properly (diff)
downloadtgif-9cffb8c8bfd64d97769b3e3792201bcb3618dd23.tar.xz
git-p4: recognize all p4 filetypes
The previous code was approximate in the filetypes it recognized. Put in the canonical list and be more careful about matching elements of the file type. This might change behavior in some cases, hopefully for the better. Windows newline mangling will now happen on all text files. Previously some like "text+ko" were oddly exempt. Files with multiple combinations of modifiers, like "text+klx", are now recognized for keyword expansion. I expect these to be seen only rarely. Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.c')
0 files changed, 0 insertions, 0 deletions