vim: run git command in directory of diary/wiki file

This should fix the issue I was having with conflicts all the time

diff --git a/vim/vimrc b/vim/vimrc
index 6648b7d07aae490fdf7f568c8f76593333c78b64..f1dc3f8966578b283ef9e4ec2b6713e6428b87d0 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -746,8 +746,8 @@ omap T <Plug>Sneak_T
 let g:vimwiki_list = [{'path': '$XDG_DATA_HOME/vimwiki'}]
 let g:vimwiki_auto_chdir = 1
 augroup myvimwiki
 let g:vimwiki_list = [{'path': '$XDG_DATA_HOME/vimwiki'}]
 let g:vimwiki_auto_chdir = 1
 augroup myvimwiki

-  au! BufRead            $XDG_DATA_HOME/vimwiki/index.wiki   !git pull
-  au! BufRead,BufNewFile $XDG_DATA_HOME/vimwiki/diary/*.wiki !git pull
+  au! BufRead            $XDG_DATA_HOME/vimwiki/index.wiki   !git -C "%:p:h" pull
+  au! BufRead,BufNewFile $XDG_DATA_HOME/vimwiki/diary/*.wiki !git -C "%:p:h" pull

   au! BufWritePost       $XDG_DATA_HOME/vimwiki/*.wiki       exe  '!git add "<afile>";git commit -m"' . strftime("%FT%R") . '";git push'
 augroup END
 
   au! BufWritePost       $XDG_DATA_HOME/vimwiki/*.wiki       exe  '!git add "<afile>";git commit -m"' . strftime("%FT%R") . '";git push'
 augroup END