Douglas Tyler dougwt

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.

Launch Sublime Text 2 from the Mac OS X Terminal

Sublime Text 2 ships with a CLI called subl (why not "sublime", go figure). This utility is hidden in the following folder (assuming you installed Sublime in /Applications like normal folk. If this following line opens Sublime Text for you, then bingo, you're ready.

open /Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl

You can find more (official) details about subl here: http://www.sublimetext.com/docs/2/osx_command_line.html

Installation

Title

<Additional information about your API call. Try to use verbs that match both request type (fetching vs modifying) and plurality (one vs multiple).>

URL

<The URL Structure (path only, no root url)>
Method:

rage-quit support for bash

HOW TO INSTALL

Put flip somewhere in your $PATH and chmod a+x it.

Copy fuck into ~/.bashrc.

	#!/usr/bin/env ruby

	# Aside from removing Ruby on Rails specific code this is taken verbatim from
	# mislav's git-deploy (http://github.com/mislav/git-deploy) and it's awesome
	# - Ryan Florence (http://ryanflorence.com)
	#
	# Install this hook to a remote repository with a working tree, when you push
	# to it, this hook will reset the head so the files are updated

	if ENV['GIT_DIR'] == '.'

	#!/usr/bin/env sh

	##
	# This is script with usefull tips taken from:
	# https://github.com/mathiasbynens/dotfiles/blob/master/.osx
	#
	# install it:
	# curl -sL https://raw.github.com/gist/2108403/hack.sh \| sh
	#

	#!/usr/bin/env python
	# A quick and dirty script to rename a pinboard.in tag.
	# I'll probably update this become a proper command line app one day

	import urllib2
	import pinboard

	pinuser = ""
	pinpasswd = ""

	#!/usr/bin/env python

	"""
	Git pre-commit hook to enforce PEP8 rules and run unit tests.

	Copyright (C) Sarah Mount, 2013.

	This program is free software; you can redistribute it and/or
	modify it under the terms of the GNU General Public License
	as published by the Free Software Foundation; either version 2