June 2010
2 posts
“when you don’t create things, you become defined by your tastes rather...”
– Just saw this tweet by _why in a RailsConf ‘10 talk by Neal Ford. It’s been two months since I’ve started doing full-time Ruby development (at ZumoDrive). I’ve seen some beautiful code, I’ve cursed meta-programming (someone overrided something inside a gem somewhere and...
git-difftool & git-mergetool - using Araxis on OS...
We use GitHub at work for all projects. One of the things I’ve always missed while using git is the ability to see 2 files side-by-side when I view diffs. The minimal context that you get when you do git diff | mate is just not enough sometimes. I discovered a solution to this today.
Git supports external diff-tool and merge-tools. In fact, there’s a git-difftool and a git-mergetool...