Brian R. Jackson jaxzin

The following code is day-to-day operations when working with 3 forks: an open source project, a local fork of that project, and a company fork of that project. The power of Git is remote aliases that allow you to work with all 3 forks in parallel in the same code base and instantly compare, push, merge, etc.

Setup:

#> git clone [url of local fork: ie: username/project]
#> cd project
#> git remote add project [url of project: ie: project/project]
#> git remote add company [url of company fork: ie: company/project]

	#!/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
	#

	#! /bin/sh

	for x
	do
	echo "Converting $x"
	tr -d '\015' < "$x" > "tmp.$x"
	mv "tmp.$x" "$x"
	done

	emotion :+1: :-1: :clap: :heart: :sparkles: :v: :zzz:
	icon :new: :ok: :cool: :vs: :tm: :warning: :wheelchair: :zap: :art: :bomb: :bulb: :key: :lock: :memo: :mag:
	item :book: :gift: :moneybag: :mega: :scissors: :hammer:
	device :computer: :iphone: :calling: :email:
	human :cop: :runner: :feet: :fist: :punch: :lipstick: :tophat:
	food :beer: :cake: :smoking:
	behicle :airplane: :bike: :bus: :ski: :taxi: :train:
	animal :bear: :fish: :octocat:
	nature :fire: :leaves: :star: :sunny:

	# The default Responder returns 200, {} for a PUT success.
	# Not really happy with that. A 204, nil would be better.
	# However, for most resources the result of a PUT is that something changes (updated_at).
	# A 200 with the updated resource makes sense in that case.
	#
	# Not really happy with this first cut.
	#
	class ResourceResponder < ActionController::Responder
	protected