# HG changeset patch # User zegervdv # Date 1405893266 -7200 # Node ID 7d3ded16eaa2f3cc9950dd4e63520797d071a677 # Parent bd487e57edd52fbd7d947c34407d5c856bbce4d6 Fix git and ctags hooks diff -r bd487e57edd5 -r 7d3ded16eaa2 gitconfig --- a/gitconfig Sat Jul 19 16:11:45 2014 +0200 +++ b/gitconfig Sun Jul 20 23:54:26 2014 +0200 @@ -32,10 +32,10 @@ # Setting to git 2.0 default to surpress warning message default = simple [init] - templatedir = ~/.templates/git + templatedir = ~/.templates/git [diff] - tool = mvimdiff + tool = mvimdiff [difftool "mvimdiff"] - cmd = mvim -f -d \"$LOCAL\" \"$REMOTE\" + cmd = mvim -f -d \"$LOCAL\" \"$REMOTE\" [status] - branch = 1 + branch = 1 diff -r bd487e57edd5 -r 7d3ded16eaa2 vimrc --- a/vimrc Sat Jul 19 16:11:45 2014 +0200 +++ b/vimrc Sun Jul 20 23:54:26 2014 +0200 @@ -52,9 +52,12 @@ set history=100 set wildmenu set wildmode=full +set ttyfast set diffopt+=iwhite +set tags=.git/tags + set formatoptions= set formatoptions+=c " Format comments set formatoptions+=r " Continue comments by default diff -r bd487e57edd5 -r 7d3ded16eaa2 zshrc --- a/zshrc Sat Jul 19 16:11:45 2014 +0200 +++ b/zshrc Sun Jul 20 23:54:26 2014 +0200 @@ -82,6 +82,7 @@ alias mvim="reattach-to-user-namespace mvim" alias vim="reattach-to-user-namespace vim" alias ag="ag --color" +alias dot="cd ~/.dotfiles" compctl -g '~/.teamocil/*(:t:r)' teamocil