| require 'rubygems' | |
| require 'rack/rewrite' | |
| use Rack::Rewrite do | |
| rewrite '/', '/index.html' | |
| end | |
| use Rack::Static, :urls => ['/'], :root => "public" | |
| run Rack::Directory.new('public') |
| // ========================= getStyleProperty by kangax =============================== | |
| // http://perfectionkills.com/feature-testing-css-properties/ | |
| var getStyleProperty = (function(){ | |
| var prefixes = ['Moz', 'Webkit', 'Khtml', 'O', 'Ms']; | |
| var _cache = { }; | |
| function getStyleProperty(propName, element) { |
FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.
The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.
