From 178f31b1b58c73379ac90eee82012ca4417ebc96 Mon Sep 17 00:00:00 2001
From: Samir Benmendil <me@rmz.io>
Date: Wed, 1 Mar 2017 00:30:05 +0000
Subject: [PATCH] vim: run git command in directory of diary/wiki file

This should fix the issue I was having with conflicts all the time
---
 vim/vimrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vim/vimrc b/vim/vimrc
index 6648b7d..f1dc3f8 100644
--- 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
-  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
 
-- 
2.48.1