Kevin Gaudin KevinGaudin

## simple-git-branching-model.md

      
              4 files
            
          
              35 forks
            
          
              43 comments
            
          
              1726 stars
            
          
                jbenet
                / simple-git-branching-model.md
            
            
              Last active
              June 17, 2024 14:53
            
              
                a simple git branching model
              
          
    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.

  
## feedback_android.java
// more information here: http://blog.tomtasche.at/2012/10/use-built-in-feedback-mechanism-on.html

try {
    int i = 3 / 0;
} catch (Exception e) {
    ApplicationErrorReport report = new ApplicationErrorReport();
    report.packageName = report.processName = getApplication()
        .getPackageName();
    report.time = System.currentTimeMillis();
    report.type = ApplicationErrorReport.TYPE_CRASH;

## index.html
<!DOCTYPE html>
<html>
  <head>
    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
    <title>Testing Pie Chart</title>
    <script type="text/javascript" src="http://mbostock.github.com/d3/d3.js?2.1.3"></script>
    <script type="text/javascript" src="http://mbostock.github.com/d3/d3.geom.js?2.1.3"></script>
    <script type="text/javascript" src="http://mbostock.github.com/d3/d3.layout.js?2.1.3"></script>

    <style type="text/css">

## couchdb-ec2-install.sh
#!/bin/bash

#
# This script installs and configures couchdb on a fresh Amazon Linux AMI instance.
#
# Must be run with root privileges
# Tested with Amazon Linux AMI release 2011.02.1.1 (ami-8c1fece5)
#

export BUILD_DIR="$PWD"

## .bashrc
# http://henrik.nyh.se/2008/12/git-dirty-prompt
# http://www.simplisticcomplexity.com/2008/03/13/show-your-git-branch-name-in-your-prompt/
#   username@Machine ~/dev/dir[master]$   # clean working directory
#   username@Machine ~/dev/dir[master*]$  # dirty working directory

function parse_git_dirty {
  [[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "*"
}
function parse_git_branch {
  git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/[\1$(parse_git_dirty)]/"
	// more information here: http://blog.tomtasche.at/2012/10/use-built-in-feedback-mechanism-on.html

	try {
	int i = 3 / 0;
	} catch (Exception e) {
	ApplicationErrorReport report = new ApplicationErrorReport();
	report.packageName = report.processName = getApplication()
	.getPackageName();
	report.time = System.currentTimeMillis();
	report.type = ApplicationErrorReport.TYPE_CRASH;
	<!DOCTYPE html>
	<html>
	<head>
	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
	<title>Testing Pie Chart</title>
	<script type="text/javascript" src="http://mbostock.github.com/d3/d3.js?2.1.3"></script>
	<script type="text/javascript" src="http://mbostock.github.com/d3/d3.geom.js?2.1.3"></script>
	<script type="text/javascript" src="http://mbostock.github.com/d3/d3.layout.js?2.1.3"></script>

	<style type="text/css">
	#!/bin/bash

	#
	# This script installs and configures couchdb on a fresh Amazon Linux AMI instance.
	#
	# Must be run with root privileges
	# Tested with Amazon Linux AMI release 2011.02.1.1 (ami-8c1fece5)
	#

	export BUILD_DIR="$PWD"
	# http://henrik.nyh.se/2008/12/git-dirty-prompt
	# http://www.simplisticcomplexity.com/2008/03/13/show-your-git-branch-name-in-your-prompt/
	# username@Machine ~/dev/dir[master]$ # clean working directory
	# username@Machine ~/dev/dir[master*]$ # dirty working directory

	function parse_git_dirty {
	[[ $(git status 2> /dev/null \| tail -n1) != "nothing to commit (working directory clean)" ]] && echo "*"
	}
	function parse_git_branch {
	git branch --no-color 2> /dev/null \| sed -e '/^[^]/d' -e "s/ \(.*\)/[\1$(parse_git_dirty)]/"