hunner/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added mvimdiff hacks and gdt alias for difftool

Browse source
This commit is contained in:
Hunter Haugen 2011-03-15 22:17:01 -07:00
parent 1f9e1b3ad0
commit 8482bdeff6
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.gitconfig
View file

@ -5,3 +5,8 @@
ui = true ui = true
[alias] [alias]
lg = "log --pretty=format:'%C(yellow)%h%C(reset) %C(blue)%an%C(reset) %C(cyan)%cr%C(reset) %s %C(green)%d%C(reset)' --graph" lg = "log --pretty=format:'%C(yellow)%h%C(reset) %C(blue)%an%C(reset) %C(cyan)%cr%C(reset) %s %C(green)%d%C(reset)' --graph"
[diff]
tool = vimdiff
[difftool "vimdiff"]
cmd = mvimdiff
path = /Users/hunner/local/bin/mvimdiff

6
.vim/colors/ir_black.vim
View file

@ -94,6 +94,12 @@ hi WarningMsg guifg=white guibg=#FF6C60 gui=BOLD ctermfg=wh
" Message displayed in lower left, such as --INSERT-- " Message displayed in lower left, such as --INSERT--
hi ModeMsg guifg=black guibg=#C6C5FE gui=BOLD ctermfg=black ctermbg=cyan cterm=BOLD hi ModeMsg guifg=black guibg=#C6C5FE gui=BOLD ctermfg=black ctermbg=cyan cterm=BOLD
" Diff colors
hi DiffAdd guifg=NONE guibg=#26512D gui=NONE ctermfg=NONE ctermbg=darkgray cterm=NONE
hi DiffChange guifg=NONE guibg=#262D51 gui=NONE ctermfg=NONE ctermbg=darkgray cterm=NONE
hi DiffText guifg=NONE guibg=#384048 gui=NONE ctermfg=NONE ctermbg=darkgray cterm=NONE
hi DiffDelete guifg=NONE guibg=#512D26 gui=NONE ctermfg=NONE ctermbg=darkgray cterm=NONE
if version >= 700 " Vim 7.x specific colors if version >= 700 " Vim 7.x specific colors
hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=BOLD hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=BOLD
hi CursorLine guifg=NONE guibg=#121212 gui=NONE ctermfg=NONE ctermbg=NONE cterm=BOLD hi CursorLine guifg=NONE guibg=#121212 gui=NONE ctermfg=NONE ctermbg=NONE cterm=BOLD

1
.zshrc
View file

@ -225,6 +225,7 @@ alias gb="git branch"
alias gc="git commit" alias gc="git commit"
alias gca="git commit --amend" alias gca="git commit --amend"
alias gd="git diff" alias gd="git diff"
alias gdt="git difftool"
alias go="git checkout" alias go="git checkout"
alias gob="git checkout -b" alias gob="git checkout -b"
alias gk="gitk --all&" alias gk="gitk --all&"