properly work with tpope' vim-git

diff --git a/.vim/ftdetect/git-commit.vim b/.vim/ftdetect/git-commit.vim
deleted file mode 100644 (file)
index ef844c3..0000000
--- a/.vim/ftdetect/git-commit.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-augroup filetypedetect
-  au BufRead,BufNewFile COMMIT_EDITMSG set ft=git
-augroup END

diff --git a/.vim/ftdetect/git-config.vim b/.vim/ftdetect/git-config.vim
deleted file mode 100644 (file)
index b1a1016..0000000
--- a/.vim/ftdetect/git-config.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-augroup filetypedetect
-  au! BufNewFile,BufRead *.git/config,*/.git/config,.gitconfig,gitconfig set ft=dosini
-augroup END

diff --git a/.vim/ftdetect/gitsendemail.vim b/.vim/ftdetect/gitsendemail.vim
deleted file mode 100644 (file)
index e54b01f..0000000
--- a/.vim/ftdetect/gitsendemail.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-augroup filetypedetect
-  " detect git-send-email messages
-  au! BufRead,BufNewFile .msg.[0-9]*
-        \ if getline(1) =~ '^From .\+ignored\.$' | set ft=gitsendemail | endif
-augroup END

diff --git a/.vim/ftplugin/git.vim b/.vim/ftplugin/git.vim
deleted file mode 120000 (symlink)
index 27766e4..0000000
--- a/.vim/ftplugin/git.vim
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/vim-scripts/ftplugin/git.vim
\ No newline at end of file

diff --git a/.vim/syntax/git.vim b/.vim/syntax/git.vim
deleted file mode 120000 (symlink)
index 72c5ea2..0000000
--- a/.vim/syntax/git.vim
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/vim-scripts/syntax/git.vim
\ No newline at end of file

diff --git a/.vimrc b/.vimrc
index 99a26c5afd47e041e548b500f10064e48ef0ee3b..0bf4fd51fbbc0dc42e014fa815d21c19807557eb 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -1448,6 +1448,9 @@ colorscheme madduck
 autocmd BufNewFile,BufRead /etc/logcheck/*.d*/* set tw=0
 autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/*.d*/* set tw=0
 
 autocmd BufNewFile,BufRead /etc/logcheck/*.d*/* set tw=0
 autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/*.d*/* set tw=0
 

+" display the git-diff --cached in window below commit
+autocmd FileType gitcommit DiffGitCached | wincmd J
+

 " jump to last known position in file (:he last-position-jump)
 autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"zz" | endif
 
 " jump to last known position in file (:he last-position-jump)
 autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"zz" | endif