From 8482bdeff6c42c19e21003a7fdeb97db26827a07 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <h.haugen@gmail.com>
Date: Tue, 15 Mar 2011 22:17:01 -0700
Subject: [PATCH] Added mvimdiff hacks and gdt alias for difftool

---
 .gitconfig               | 5 +++++
 .vim/colors/ir_black.vim | 6 ++++++
 .zshrc                   | 1 +
 3 files changed, 12 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 63657c9..3318d46 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,3 +5,8 @@
 	ui = true
 [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"
+[diff]
+	tool = vimdiff
+[difftool "vimdiff"]
+	cmd = mvimdiff
+	path = /Users/hunner/local/bin/mvimdiff
diff --git a/.vim/colors/ir_black.vim b/.vim/colors/ir_black.vim
index 82601c7..d33f76d 100644
--- a/.vim/colors/ir_black.vim
+++ b/.vim/colors/ir_black.vim
@@ -94,6 +94,12 @@ hi WarningMsg       guifg=white       guibg=#FF6C60     gui=BOLD      ctermfg=wh
 " Message displayed in lower left, such as --INSERT--
 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
   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
diff --git a/.zshrc b/.zshrc
index d223984..4aa980f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -225,6 +225,7 @@ alias gb="git branch"
 alias gc="git commit"
 alias gca="git commit --amend"
 alias gd="git diff"
+alias gdt="git difftool"
 alias go="git checkout"
 alias gob="git checkout -b"
 alias gk="gitk --all&"