Tyler Weir » Development http://www.praytothemachine.com/evil If it don't make dollars, then it don't make sense... Fri, 23 Apr 2010 14:18:23 +0000 en hourly 1 http://wordpress.org/?v=3.0 Using MacVim as your git mergetool http://www.praytothemachine.com/evil/2009/10/30/using-macvim-as-your-git-mergetool/ http://www.praytothemachine.com/evil/2009/10/30/using-macvim-as-your-git-mergetool/#comments Fri, 30 Oct 2009 18:17:55 +0000 Tyler http://www.praytothemachine.com/evil/?p=2195 Continue reading →]]> Install MacVim and the command line tool, mvim.

Then in your ~/.gitconfig add this, thusly (replacing the path to mvim with the correct one):

[merge]
tool = mvim
[mergetool “mvim”]
cmd=/Users/tjweir/bin/mvim -d -g $LOCAL $MERGED $REMOTE
keepbackup=false

Then you can “git mergetool” all you’d like.

]]> http://www.praytothemachine.com/evil/2009/10/30/using-macvim-as-your-git-mergetool/feed/ 0 iPhone Development Haiku: 1 UIs did not… http://www.praytothemachine.com/evil/2009/07/16/iphone-development-haiku-1-uis-did-not/ http://www.praytothemachine.com/evil/2009/07/16/iphone-development-haiku-1-uis-did-not/#comments Fri, 17 Jul 2009 01:46:04 +0000 Tyler http://www.praytothemachine.com/evil/2009/07/16/iphone-development-haiku-1-uis-did-not/ iPhone Development Haiku: 1

UIs did not flow,
Awkward and stilted design,
Maybe tomorrow.

]]> http://www.praytothemachine.com/evil/2009/07/16/iphone-development-haiku-1-uis-did-not/feed/ 1