hellerve/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated gitconfig with histogram diff algorithm and added rust highlighting to vimrc

Browse Source
This commit is contained in:
hellerve
2015-08-26 14:33:02 +02:00
parent 4ce8ee31ad
commit ca50b5fdd9
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vim/bundle/vim-jade

Submodule .vim/bundle/vim-jade updated: 0aa231c9a5...fb47bb8303

8
gitconfig
View File

@@ -5,6 +5,7 @@
co = checkout co = checkout
contains = branch --contains contains = branch --contains
cr = codereview cr = codereview
exclude = !sh -c 'echo "$1" >> .git/info/exclude' -
ignored = ls-files --others 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)' 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 lgc = log ORIG_HEAD.. --stat --no-merges
@@ -56,13 +57,14 @@
untracked = cyan untracked = cyan
[core] [core]
excludesfile = /Users/sidharta/.gitignore excludesfile = /Users/sidharta/.gitignore
whitespace = space-before-tabmtrailing-space whitespace = space-before-tabmtrailing-space
autocrlf = input autocrlf = input
editor = /usr/local/bin/vim editor = /usr/local/bin/vim
[diff] [diff]
tool = vimdiff tool = vimdiff
algorithm = histogram
[github] [github]
user = hellerve user = hellerve

1
vimrc
View File

@@ -88,6 +88,7 @@ Bundle 'Twinside/vim-hoogle'
" Other programming languages " Other programming languages
Bundle 'digitaltoad/vim-jade' Bundle 'digitaltoad/vim-jade'
Bundle 'zepto-lang/zepto-vim' Bundle 'zepto-lang/zepto-vim'
Plugin 'rust-lang/rust.vim'
" Custom bundles " Custom bundles
if filereadable(expand("~/.vim.local/bundles.vim")) if filereadable(expand("~/.vim.local/bundles.vim"))