diff --git a/.vim/bundle/vim-jade b/.vim/bundle/vim-jade index 0aa231c..fb47bb8 160000 --- a/.vim/bundle/vim-jade +++ b/.vim/bundle/vim-jade @@ -1 +1 @@ -Subproject commit 0aa231c9a5eef0a0943a1b4d16fd1e881f54f08f +Subproject commit fb47bb8303e81fc17b4340ccd01a462332f7d90a diff --git a/gitconfig b/gitconfig index b078004..20bd48c 100644 --- a/gitconfig +++ b/gitconfig @@ -5,6 +5,7 @@ co = checkout contains = branch --contains cr = codereview + exclude = !sh -c 'echo "$1" >> .git/info/exclude' - ignored = ls-files --others lg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold cyan)- %an%C(reset)%C(bold yellow)%d%C(reset)' lgc = log ORIG_HEAD.. --stat --no-merges @@ -56,13 +57,14 @@ untracked = cyan [core] - excludesfile = /Users/sidharta/.gitignore + excludesfile = /Users/sidharta/.gitignore whitespace = space-before-tabmtrailing-space autocrlf = input - editor = /usr/local/bin/vim + editor = /usr/local/bin/vim [diff] - tool = vimdiff + tool = vimdiff + algorithm = histogram [github] user = hellerve diff --git a/vimrc b/vimrc index 2f80df3..2efc769 100644 --- a/vimrc +++ b/vimrc @@ -88,6 +88,7 @@ Bundle 'Twinside/vim-hoogle' " Other programming languages Bundle 'digitaltoad/vim-jade' Bundle 'zepto-lang/zepto-vim' +Plugin 'rust-lang/rust.vim' " Custom bundles if filereadable(expand("~/.vim.local/bundles.vim"))