Mercurial > dotfiles.old
changeset 79:7d3ded16eaa2
Fix git and ctags hooks
author | zegervdv <zegervdv@me.com> |
---|---|
date | Sun, 20 Jul 2014 23:54:26 +0200 |
parents | bd487e57edd5 |
children | 16edf05ad21a |
files | gitconfig vimrc zshrc |
diffstat | 3 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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