Jannis Leidel jezdez

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.

In Memory of Malcolm

Last night, I received the news that Malcolm Tredinnick had passed away. I was at the hotel bar, concluding the first night of sprints at PyCon 2013. It took everything I had not to spontaneously start crying on the spot.

Malcolm was a friend, a mentor, a valued community mentor, a leader and a wonderful human being. He gave freely of himself to so very many people & causes. He made himself available to others, even when he was so busy he could

	#!/usr/bin/env python
	"""
	james.py - Chief CLI.

	USAGE: james.py ENV REF
	ENV - Environment defined in the config file to deploy to.
	REF - A git reference (like a SHA) to deploy.

	Config: james.ini in the current directory should be an ini file with
	one section per environment. Each environment should have a

	#!/usr/bin/env python

	"""
	USAGE:
	$ git branch \| branch-info.py

	By peterbe
	"""

	import sys

	if not set -q AUTOENVFISH_FILE
	set -g AUTOENVFISH_FILE ".env.fish"
	end

	# Automatic env loading
	function _autoenvfish --on-variable PWD
	if status --is-command-substitution # doesn't work with 'or', inexplicably
	return
	end

	"""
	Demonstrates loading settings from a module and overriding it by a class
	"""

	import os
	from django.utils import importlib
	from django.conf.default import *


	class ConfigurationLoader(SettingsSourcesLoader):

	"""
	This gist is a one-click pip setup for windows:

	1. installs distribute if needed
	2. installs pip
	3. (On windows) sets the path environment variable so "pip" is always runnable from cmd.

	Tested on Windows 7 with python2.7
	"""

	#!/bin/bash

	export LEEROY_URL="https://leeroybot.herokuapp.com/"
	LEEROY_RERUN="https://raw.github.com/lonnen/leeroy-rerun/master/leeroy-rerun.py"

	# Usage
	[[ -z $1 ]] \|\| [[ -z $2 ]] && {
	echo "Rerun a Leeroy job for a Mozilla project."
	echo -e " $ $(basename $0) PROJECT PULLNUM"
	exit 1

	# you need to install python-gpgme

	import StringIO
	import urllib
	import gpgme
	import shutil, tempfile
	import os
	from contextlib import closing, contextmanager

	tarball = 'http://pypi.python.org/packages/source/s/signtest/signtest-1.0.tar.gz'