Mitch Tishmack mitchty

a simple git branching model (written in 2013)

This is a very simple git workflow. It (and variants) is in use by many people. I settled on it after using it very effectively at Athena. GitHub does something similar; Zach Holman mentioned it in this talk.

Update: Woah, thanks for all the attention. Didn't expect this simple rant to get popular.

Run these once to setup git options:

git config --global push.default current
git config --global merge.defaultToUpstream true
git config --global branch.autosetupmerge true
git config --global branch.autosetuprebase remote
git config --global alias.cb 'checkout -b'
git config --global alias.ps 'push -u'
git config --global alias.pl '!git fetch -p && git rebase'

Use them like this:

Moved

The current version will be found at https://gist.github.com/mike-bourgeous/2be6c8900bf624887fe5fee4f28552ef

Please make all comments, stars, forks, etc. there.

	module Main where

	import Filesystem (getWorkingDirectory)
	import Filesystem.Path (extensions)
	import System.FSNotify
	import System.Exit
	import System.Environment
	import System.Cmd
	import Control.Concurrent
	import Control.Monad

	13:15 <xQuasar> \| HASKELL IS FOR FUCKIN FAGGOTS. YOU'RE ALL A BUNCH OF
	\| FUCKIN PUSSIES
	13:15 <xQuasar> \| JAVASCRIPT FOR LIFE FAGS
	13:16 <luite> \| hello
	13:16 <ChongLi> \| somebody has a mental illness!
	13:16 <merijn> \| Wow...I suddenly see the error of my ways and feel
	\| compelled to write Node.js!
	13:16 <genisage> \| hi
	13:16 <luite> \| you might be pleased to learn that you can compile
	\| haskell to javascript now

	#!/bin/sh

	###
	# SOME COMMANDS WILL NOT WORK ON macOS (Sierra or newer)
	# For Sierra or newer, see https://github.com/mathiasbynens/dotfiles/blob/master/.macos
	###

	# Alot of these configs have been taken from the various places
	# on the web, most from here
	# https://github.com/mathiasbynens/dotfiles/blob/5b3c8418ed42d93af2e647dc9d122f25cc034871/.osx