Andy Fang ajaxsys

HOWTO: Using FileMerge (opendiff) with Git on OSX

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.

Backstory: I decided to crowdsource static site generator recommendations, so the following are actual real world suggested-to-me results. I then took those and sorted them by language/server and, just for a decent relative metric, their Github Watcher count. If you want a heap of other projects (including other languages like Haskell and Python) Nanoc has the mother of all site generator lists. If you recommend another one, by all means add a comment.

Ruby

Jekyll 5,676
Octopress 2,696
Middleman 685
NestaCMS 664
Statis 509
Nanoc 355

Jade FTW

こんにちは。今回は現実逃避を兼ねて Jade の素晴らしさをお伝えしたいと思います。

Jade とは何か

[Jade][0] は JST (JavaScript Templates) の一つであり、HTML を書くための[軽量マークアップ言語][1] である [Haml][2] に影響を受けた JavaScript テンプレートエンジンでもあります。

	`prettier-eslint`	`eslint-plugin-prettier`	`eslint-config-prettier`
What it is	A JavaScript module exporting a single function.	An ESLint plugin.	An ESLint configuration.
What it does	Runs the code (string) through `prettier` then `eslint --fix`. The output is also a string.	Plugins usually contain implementations for additional rules that ESLint will check for. This plugin uses Prettier under the hood and will raise ESLint errors when your code differs from Prettier's expected output.	This config turns off formatting-related rules that might conflict with Prettier, allowing you to use Prettier with other ESLint configs like `eslint-config-airbnb`.
How to use it	Either calling the function in your code or via [`prettier-eslint-cli`](https://github.co

	/*
	* object.watch polyfill
	*
	* 2012-04-03
	*
	* By Eli Grey, http://eligrey.com
	* Public Domain.
	* NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
	*/

	var http = require("http"),
	url = require("url"),
	path = require("path"),
	fs = require("fs")
	port = process.argv[2] \|\| 8888;

	http.createServer(function(request, response) {

	var uri = url.parse(request.url).pathname
	, filename = path.join(process.cwd(), uri);

	server {
	root /var/www/example.com/static;
	server_name example.com;
	access_log /var/log/nginx/example.com.access.log;
	error_log /var/log/nginx/example.com.error.log;

	try_files /maintenance.html @proxy;

	location @proxy {
	proxy_pass http://127.0.0.1:10001;

	sudo wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo
	sudo sed -i s/\$releasever/6/g /etc/yum.repos.d/epel-apache-maven.repo
	sudo yum install -y apache-maven
	mvn --version

	#...

	function gitzip() {
	git archive -o [email protected] HEAD
	}

	#... gitzip ZIPPED_FILE_NAME

	// dependencies
	var async = require('async');
	var AWS = require('aws-sdk');
	// Enable ImageMagick integration.
	var gm = require('gm').subClass({ imageMagick: true });
	var util = require('util');
	var pdf2png = require('pdf2png');
	pdf2png.ghostscriptPath = "/usr/bin";

	// constants