Ayoze Barrera ayozebarrera

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.

	<!DOCTYPE html>
	<html>
	<head>
	<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
	<title>One Graph</title>
	<script type="text/javascript" src="http://mbostock.github.com/d3/d3.v2.js"></script>
	<script type="text/javascript" src="simple-graph.js"></script>
	<style type="text/css">
	body { font: 13px sans-serif; }
	rect { fill: #fff; }

	// ==UserScript==
	// @name Use Markdown, sometimes, in your HTML.
	// @author Paul Irish <http://paulirish.com/>
	// @link http://git.io/data-markdown
	// @match *
	// ==/UserScript==


	// If you're not using this as a userscript just delete from this line up. It's cool, homey.

	/**
	* Creates a new Uint8Array based on two different ArrayBuffers
	*
	* @private
	* @param {ArrayBuffers} buffer1 The first buffer.
	* @param {ArrayBuffers} buffer2 The second buffer.
	* @return {ArrayBuffers} The new ArrayBuffer created out of the two.
	*/
	var _appendBuffer = function(buffer1, buffer2) {
	var tmp = new Uint8Array(buffer1.byteLength + buffer2.byteLength);

	// # Mocha Guide to Testing
	// Objective is to explain describe(), it(), and before()/etc hooks

	// 1. `describe()` is merely for grouping, which you can nest as deep
	// 2. `it()` is a test case
	// 3. `before()`, `beforeEach()`, `after()`, `afterEach()` are hooks to run
	// before/after first/each it() or describe().
	//
	// Which means, `before()` is run before first it()/describe()

	# ---------------------------------------------------------------------------
	#
	# Description: This file holds all my BASH configurations and aliases
	#
	# Sections:
	# 1. Environment Configuration
	# 2. Make Terminal Better (remapping defaults and adding functionality)
	# 3. File and Folder Management
	# 4. Searching
	# 5. Process Management

	/***************************
	NOT MAINTAINED! from ~2014
	****************************/

	// cs4+ script for resizing objects proportionally to fit inside artboard
	// based on: https://forums.adobe.com/message/4164590
	// usage: create a new document with desired artboard size, paste object, select it, run this script
	// bugs: centering does not work after changing artboard size

	var activeDoc = app.activeDocument

	var externalObj = {key: 'value'};

	var items = {
	obj: {
	'string prop': 'string val',
	5: 10,
	nested: [[3, [5, 2]]],
	'function': function(){return true;},
	reference: externalObj
	},

	###############################################################################
	# EMPEZANDO ###################################################################
	###############################################################################

	# Configurar email y nombre
	git config --global user.name "John Doe"
	git config --global user.email "[email protected]"

	# Crear un nuevo repositorio
	git init

	function numerical_int(dx, y_array) {
	var maxy = Math.max.apply(null, y_array);
	var dy_array = y_array.map(function(num) {
	return Math.abs(maxy - num);
	});
	var profile_integral = 0;
	var n = dy_array.length;
	for (i = 1; i < n; i++) {
	var dy_init = dy_array[i - 1];
	var dy_end = dy_array[i];