Nathan Long nathanlong

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.

Project structure

Example project directory, the root folders are pretty consistent, the sub directories (on lib, etc) are just examples of what might be in there.

.
├── lib
│   ├── db
│   ├── handlers
│   └── routes

	function mamp() {
	#
	# Default location of the apache conf file for MAMP
	CONF_FILE="/Applications/MAMP/conf/apache/httpd.conf"
	#
	# Fish existing doc root out of conf file
	LINE=$(cat $CONF_FILE \| grep ^DocumentRoot)
	QUOTED_STRING=${LINE/DocumentRoot /}
	OLD_DOC_ROOT=${QUOTED_STRING//\"/}
	#

	$base-font-size: 16px;
	$base-line-height: 1.5;

	// this value may vary for each font
	// unitless value relative to 1em
	$cap-height: 0.68;


	@mixin baseline($font-size, $scale: 2) {

	#!/bin/bash
	directory=_site
	branch=gh-pages
	build_command() {
	jekyll build
	}

	echo -e "\033[0;32mDeleting old content...\033[0m"
	rm -rf $directory

	#!/bin/bash
	directory=_site
	branch=gh-pages
	build_command() {
	jekyll build
	}

	echo -e "\033[0;32mDeleting existing $branch...\033[0m"
	git push origin --delete $branch
	git branch -D $branch