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.
| echo 'export PATH=$HOME/local/bin:$PATH' >> ~/.bashrc | |
| . ~/.bashrc | |
| mkdir ~/local | |
| mkdir ~/node-latest-install | |
| cd ~/node-latest-install | |
| curl http://nodejs.org/dist/node-latest.tar.gz | tar xz --strip-components=1 | |
| ./configure --prefix=~/local | |
| make install # ok, fine, this step probably takes more than 30 seconds... | |
| curl https://www.npmjs.org/install.sh | sh |
| DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE | |
| Version 2, December 2004 | |
| Copyright (C) 2011 Jed Schmidt <http://jed.is> | |
| Everyone is permitted to copy and distribute verbatim or modified | |
| copies of this license document, and changing it is allowed as long | |
| as the name is changed. | |
| DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE |
| ///////////////////////////// | |
| // SIZE | |
| ///////////////////////////// | |
| // Base size should be the em height on the html element | |
| $base-size: 16px !default | |
| $pi: 3.14159265 !default | |
| // Android uses density-independent pixels. Using the same terminology here for conversions. | |
| // Convert dips to em, rem, or px |
| #!/usr/bin/env php | |
| <?php | |
| /** | |
| * PHP script to replace site url in Wordpress database dump, even with WPML | |
| * @link https://gist.github.com/lavoiesl/2227920 | |
| */ | |
| if (!empty($argv[1]) && $argv[1] == 'update') { | |
| $file = file_get_contents('https://gist.github.com/lavoiesl/2227920/raw/wordpress-change-url.php'); | |
| if ($file === false) { |
| /* See http://mrdanadams.com/2012/pixel-ems-css-conversion-sass-mixin/ */ | |
| /* Default font size in pixels if not overridden. */ | |
| $baseFontSize: 16; | |
| /* Convert PX units to EMs. | |
| Ex: margin-right: pem(16); | |
| */ | |
| @function pem($pxval, $base: $baseFontSize) { | |
| @return #{$pxval / $base}em; |
| /* Add a wave alignment to your title text using Sass, Compass, and Lettering.js. | |
| * | |
| * Lettering.js wraps each letter with a span with a class of .char<#>. | |
| * Compass provides math functions including the sin which provides the wave form. | |
| */ | |
| $length: 11; // The word is 11 letters long | |
| @for $i from 1 through $length { | |
| .char#{$i} { | |
| @include transform(translateY( sin(($i - 1)/($length - 1)*2*pi()) * -25px) ); |
| /* ---------------------------------------------------------- */ | |
| /* */ | |
| /* A media query that captures: */ | |
| /* */ | |
| /* - Retina iOS devices */ | |
| /* - Retina Macs running Safari */ | |
| /* - High DPI Windows PCs running IE 8 and above */ | |
| /* - Low DPI Windows PCs running IE, zoomed in */ | |
| /* - Low DPI Windows PCs and Macs running Firefox, zoomed in */ | |
| /* - Android hdpi devices and above */ |
| function asyncLoad(scriptURL,callback) | |
| { | |
| if(!scriptURL){return;} | |
| var firstScriptTag=document.getElementsByTagName('script')[0]; | |
| var js=document.createElement('script'); | |
| js.type='text/javascript'; | |
| js.src=scriptURL; | |
| js.async=true; | |
| if(callback && typeof(callback)===typeof(Function)) |
