summaryrefslogtreecommitdiff
path: root/runtime/filetype.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-18 22:54:46 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-18 22:54:46 +0200
commit7571d55f7dcc009a375b2124cce2c8b21f361234 (patch)
tree4578a5c869799173679f61adfea8bef6a63e660f /runtime/filetype.vim
parent1381d791478ee77c8368b89a3d4954316bf839b5 (diff)
downloadvim-7571d55f7dcc009a375b2124cce2c8b21f361234.zip
Updated runtime files.
Diffstat (limited to 'runtime/filetype.vim')
-rw-r--r--runtime/filetype.vim5
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f96c6adee..e46ad515c 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2016 Jul 21
+" Last Change: 2016 Aug 18
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -779,8 +779,7 @@ au BufNewFile,BufRead *.mo,*.gdmo setf gdmo
au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
" Git
-au BufNewFile,BufRead COMMIT_EDITMSG setf gitcommit
-au BufNewFile,BufRead MERGE_MSG setf gitcommit
+au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
au BufNewFile,BufRead *.git/modules/*/config setf gitconfig
au BufNewFile,BufRead */.config/git/config setf gitconfig