Anna Harren iirelu

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.

	/* passable motion blur effect using frame blending
	* basically move your 'draw()' into 'sample()', time runs from 0 to 1
	* by dave
	* http://beesandbombs.tumblr.com
	*/

	int samplesPerFrame = 32; // more is better but slower. 32 is enough probably
	int numFrames = 48;
	float shutterAngle = 2.0; // this should be between 0 and 1 realistically. exaggerated for effect here
	int[][] result;

	-- Two dashes start a one-line comment.

	--[[
	Adding two ['s and ]'s makes it a
	multi-line comment.
	--]]

	----------------------------------------------------
	-- 1. Variables and flow control.
	----------------------------------------------------

	#! /bin/bash

	# originaly from http://tinyurl.com/twitch-linux from taladan
	# www.youtube.com/user/taladan

	# gist created by brodul

	INRES="1280x800" # input resolution
	#OUTRES="1024x640" # Output resolution
	OUTRES="800x500" # Output resolution

	Latency Comparison Numbers (~2012)
	----------------------------------
	L1 cache reference 0.5 ns
	Branch mispredict 5 ns
	L2 cache reference 7 ns 14x L1 cache
	Mutex lock/unlock 25 ns
	Main memory reference 100 ns 20x L2 cache, 200x L1 cache
	Compress 1K bytes with Zippy 3,000 ns 3 us
	Send 1K bytes over 1 Gbps network 10,000 ns 10 us
	Read 4K randomly from SSD* 150,000 ns 150 us ~1GB/sec SSD