Juan Pablo Aqueveque juque

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.

	/*
	* Set up your Git configuration
	*/

	git config --global user.email "[email protected]"

	git config --global user.name "Your Name"

	git config --global core.editor "nano"

	<?php
	/*
	Plugin Name: Testimonials Custom Post Type
	Plugin URI: http://wpbeaches.com/create-custom-post-types-in-genesis-child-theme-in-wordpress/
	Description: Testimonials Custom Post Types
	Author: Neil Gowran
	Version:1.0.0
	Author URI:http://wpbeaches.com
	*/

	<!-- breadcrumbs -->
	<h2><!-- [colección] / [tipo] / [etiqueta] -->

	{% if collection and product_type and tag %}
	<a href="{{shop.url}}">Home</a> >
	<a href="{{collection \| typed_collection_path:product_type}}">
	{{collection.title}} > {{product_type.name}}</a> > {{tag}}

	<!-- [colección] / [tipo] -->

	#!ruby

	# make sure we use version 2.x of Savon
	gem 'savon', '~> 2.0'
	require 'savon'
	require 'nokogiri'

	# create the client, switch on nice logging
	clnt = Savon.client(
	wsdl: 'http://www.webservicex.net/stockquote.asmx?wsdl',

	#!/bin/bash
	# Install csvkit with csvpys
	# (csvpys hasn't been pulled back into the main csvkit repo that you can pip install)

	git clone https://github.com/cypreess/csvkit.git
	cd csvkit
	python setup.py build
	sudo python setup.py install
	cd ~

	(function () {

	var system = require('system');

	var casper = require('casper').create({
	clientScripts : [ 'jquery.min.js' ],
	waitTimeout : 30000, // ms
	logLevel : 'debug', // info, debug, warning, or error
	verbose : system.args.indexOf('-v') >= 0
	});

	source "https://rubygems.org"

	gem 'sinatra'

	group :development do
	gem 'shotgun'
	end

	<html>
	<head>
	<title>Api products</title>
	<style type="text/css" media="screen">
	#list {
	list-style-type: none;
	margin: 0;
	padding: 0;
	}
	.product {

	<!-- Formulario y botón "agregar al carro" en plantilla product.html.
	Los data-attributes son necesarios para la API Ajax del carrito (opcional) -->
	<form class="add_to_cart" action="{{ add_to_cart_url }}" method="post" data-bootic-cart-add="add" data-bootic-productId="{{ product.id }}">
	<!-- si hay más de 1 variante, muéstralas en una lista -->
	{% if product.variants_count > 1 %}
	<h4>{{ 'activerecord.models.variant' \| t }}</h4>
	<ul class="variants">
	<!-- primero las variantes disponibles -->
	{% for variant in product.available_variants %}
	<li class="bootic_variant available {% cycle 'odd', 'even' %} av-variant-{{ forloop.index }}">