Tony R Quilkey trq

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.

Locate the section for your github remote in the .git/config file. It looks like this:

[remote "origin"]
	fetch = +refs/heads/*:refs/remotes/origin/*
	url = [email protected]:joyent/node.git

Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/* to this section. Obviously, change the github url to match your project's URL. It ends up looking like this:

1. Clone your fork:

git clone [email protected]:YOUR-USERNAME/YOUR-FORKED-REPO.git

2. Add remote from original repository in your forked repository:

cd into/cloned/fork-repo
git remote add upstream git://github.com/ORIGINAL-DEV-USERNAME/REPO-YOU-FORKED-FROM.git
git fetch upstream

Awesome PHP

Awesome PHP has been relocated permanently to its own Github repository. No further updates will made to this gist.

Please open an issue for any new suggestions.

	#!/bin/sh


	# Setup some variables needed for bootstrapping the environment
	ROOT=/home/vrde/projectz/myproject
	REPOS=${ROOT}/repos

	export PYTHONPATH=${REPOS}

	<?php

	namespace MFB\Behat\Subcontext;

	use Behat\Gherkin\Node\PyStringNode;
	use Behat\MinkExtension\Context\RawMinkContext;
	use Symfony\Component\Console\Tester\CommandTester;
	use Symfony\Component\EventDispatcher\EventDispatcher;

	/**

	<?php

	namespace Acme\DemoBundle\Presenter;

	class BasePresenter
	{
	protected $subject;

	public function __construct($subject)
	{

	<?php

	namespace Dpn\ToolsBundle\Form\Type;

	use Symfony\Component\Form\AbstractType;
	use Dpn\ToolsBundle\Form\DataTransformer\EntityToIdTransformer;
	use Symfony\Component\Form\FormBuilderInterface;
	use Symfony\Component\OptionsResolver\OptionsResolverInterface;
	use Doctrine\Common\Persistence\ObjectManager;

	# Deployment server info
	set :application, "APP NAME"
	set :domain, "APP DOMAIN NAME"
	set :deploy_to, "/path/on/live/server"
	set :app_path, "app"
	set :web_path, "web"
	set :maintenance_basename, "maintenance"

	# SCM info
	set :repository, "GIT REMOTE REPO URL"

	#!/usr/bin/env sh

	##
	# This is script with usefull tips taken from:
	# https://github.com/mathiasbynens/dotfiles/blob/master/.osx
	#
	# install it:
	# curl -sL https://raw.github.com/gist/2108403/hack.sh \| sh
	#