2 branches: master = live, dev = development

Git Workflow

# start work on a new feature
# creates a new branch based on the latest stable version (which is master)
function gfnew () {
  git checkout master
  git checkout -b $*
}

# make the feature available in dev.ingame.de 
# push changes to dev and then checkout featurebranch again
# so you can continue to work on it immediately
function gfdev () {
  CURBRANCH=`git branch | grep \* | awk '{print $2}'`
  git checkout dev
  git merge $CURBRANCH
  git push origin dev
  git checkout $CURBRANCH
}

# release the feature
# push to dev & master (live system) and delete the branch
function gfrelease () {
  CURBRANCH=`git branch | grep \* | awk '{print $2}'`
  git checkout dev
  git merge $CURBRANCH
  git checkout master
  git merge $CURBRANCH
  git branch -d $CURBRANCH
  git push  
}

function gflive () {
  git tag -f stable
  git pull
  echo -n "Is everything running smoothly? [y/N] "
  read choice
  if [ "$choice" != "y" ]; then
    git checkout stable
    echo "Now fix this and come again."
  fi
}