From cee47620627fdb3ad9bc82c35712142594320cd8 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Mon, 5 May 2008 16:12:35 +0100
Subject: [PATCH] properly work with tpope' vim-git

---
 .vim/ftdetect/git-commit.vim   | 3 ---
 .vim/ftdetect/git-config.vim   | 3 ---
 .vim/ftdetect/gitsendemail.vim | 5 -----
 .vim/ftplugin/git.vim          | 1 -
 .vim/syntax/git.vim            | 1 -
 .vimrc                         | 3 +++
 6 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 .vim/ftdetect/git-commit.vim
 delete mode 100644 .vim/ftdetect/git-config.vim
 delete mode 100644 .vim/ftdetect/gitsendemail.vim
 delete mode 120000 .vim/ftplugin/git.vim
 delete mode 120000 .vim/syntax/git.vim

diff --git a/.vim/ftdetect/git-commit.vim b/.vim/ftdetect/git-commit.vim
deleted file mode 100644
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
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
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
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
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 99a26c5..0bf4fd5 100644
--- 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
 
+" 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
 
-- 
2.39.5