Lucas Caballero lcaballero

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.

This article is now published on my website: Prefer Subshells for Context.

tmux cheat sheet

(C-x means ctrl+x, M-x means alt+x)

Prefix key

The default prefix is C-b. If you (or your muscle memory) prefer C-a, you need to add this to ~/.tmux.conf:

remap prefix to Control + a

Update May 2017

Eric Bidelman has documented some of the common workflows possible with headless Chrome over in https://developers.google.com/web/updates/2017/04/headless-chrome.

Update

If you're looking at this in 2016 and beyond, I strongly recommend investigating real headless Chrome: https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md

Windows and Mac users might find using Justin Ribeiro's Docker setup useful here while full support for these platforms is being worked out.

Creating the change

$ git checkout -b my-feature

... modify code ....

$ git add <filename> 
$ git commit -m “my feature is this”

	;;
	;; NS CHEATSHEET
	;;
	;; * :require makes functions available with a namespace prefix
	;; and optionally can refer functions to the current ns.
	;;
	;; * :import refers Java classes to the current namespace.
	;;
	;; * :refer-clojure affects availability of built-in (clojure.core)
	;; functions.

	function cloneObject(object) {
	return extendObject({}, object);
	}

	function extendObject(base, object) {
	var visited = [object];

	// http://en.wikipedia.org/wiki/Adjacency_list_model
	var set = [{value: base}];

	;;; go-template-mode.el --- Major mode for Go template language

	;;; Commentary:

	;; 1) Copy this file somewhere in your Emacs `load-path'. To see what
	;; your `load-path' is, run inside emacs: C-h v load-path<RET>
	;;
	;; 2) Add the following to your .emacs file:
	;;
	;; (require 'go-template-mode)

	#!/bin/bash
	echo "Generating an SSL private key to sign your certificate..."
	openssl genrsa -des3 -out myssl.key 1024

	echo "Generating a Certificate Signing Request..."
	openssl req -new -key myssl.key -out myssl.csr

	echo "Removing passphrase from key (for nginx)..."
	cp myssl.key myssl.key.org
	openssl rsa -in myssl.key.org -out myssl.key

	#!/bin/sh
	# So you've installed XCode 6 Beta
	# Now we could use Swift toolchain to build a minimal
	# command line Hellow World

	# let's set new Developer Toolchain bundled with Xcode6-Beta.app
	# as default toolchain
	# sudo xcode-select -s /Applications/Xcode6-Beta.app/Contents/Developer

	# alias for Swift binary