John Jelinek IV johnjelinek

a simple git branching model

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.

The gist

Business Models

Advertising

Models	Examples
Display ads	Yahoo!
Search ads	Google

Since this is on Hacker News and reddit...

No, I don't distribute my résumé like this. A friend of mine made a joke about me being the kind of person who would do this, so I did (the link on that page was added later). My actual résumé is a good bit crazier.
I apologize for the use of _t in my types. I spend a lot of time at a level where I can do that; "reserved for system libraries? I am the system libraries".
Since people kept complaining, I've fixed the assignments of string literals to non-const char *s.
My use of type * name, however, is entirely intentional.
If you're using an older compiler, you might have trouble with the anonymous unions and the designated initializers - I think gcc 4.4 requires some extra braces to get them working together. Anything reasonably recent should work fine. Clang and gcc (newer than 4.4, at le

	# Idempotent way to build a /etc/hosts file with Ansible using your Ansible hosts inventory for a source.
	# Will include all hosts the playbook is run on.
	# Inspired from http://xmeblog.blogspot.com/2013/06/ansible-dynamicaly-update-etchosts.html

	- name: "Build hosts file"
	lineinfile: dest=/etc/hosts regexp='.*{{ item }}$' line="{{ hostvars[item].ansible_default_ipv4.address }} {{item}}" state=present
	when: hostvars[item].ansible_default_ipv4.address is defined
	with_items: groups['all']

	" copy all this into a vim buffer, save it, then...
	" source the file by typing :so %
	" Now the vim buffer acts like a specialized application for mastering vim

	" There are two queues, Study and Known. Depending how confident you feel
	" about the item you are currently learning, you can move it down several
	" positions, all the way to the end of the Study queue, or to the Known
	" queue.

	" type ,, (that's comma comma)

	# docker build -t="rails" .

	FROM ubuntu:12.04

	RUN apt-get update

	## MYSQL
	RUN apt-get install -y -q mysql-client libmysqlclient-dev

	## RUBY

	# Based on https://github.com/kripken/emscripten/wiki/Tutorial

	# prerequisites
	cd ~/
	brew install node
	sudo ln -s /usr/bin/python2.7 /usr/bin/python2
	curl http://llvm.org/releases/3.2/clang+llvm-3.2-x86_64-apple-darwin11.tar.gz > llvm.tgz
	tar xzvf llvm.tgz
	ln -s clang+llvm-3.2-x86_64-apple-darwin11 llvm

	def is_ipv4(ip):
	match = re.match("^(\d{0,3})\.(\d{0,3})\.(\d{0,3})\.(\d{0,3})$", ip)
	if not match:
	return False
	quad = []
	for number in match.groups():
	quad.append(int(number))
	if quad[0] < 1:
	return False
	for number in quad:

	! --------------------------------------------------------------------------------
	! This example configuration shows what WE did to get Amazon VPC working with our
	! ASAs. We use version 8.3(1). This config has not been reviewed or otherwise
	! blessed in any way by anyone at Amazon. YMMV.
	!
	! It differs from Amazon's supplied config by using two different sets of
	! crypto maps and ACLs, so it brings both tunnels up simultaneously.
	!
	! For the purposes of the example, the physical datacenter network is 172.16.1.0/24
	! and the VPC is 10.0.0.0/16.