Skip to content

Instantly share code, notes, and snippets.

@bmease
Created December 16, 2010 15:54
Show Gist options
  • Save bmease/743560 to your computer and use it in GitHub Desktop.
Save bmease/743560 to your computer and use it in GitHub Desktop.
http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html
- git checkout -b NUMBER_BRANCH_DESCRIPTION
- git commit // Multiple times
- git rebase -i origin/master // Compress down all the commits into a single one. Pick first line, squash rest
- git checkout master
- git merge NUMBER_BRANCH_DESCRIPTION
- git push origin master // Send everything back to github
- git branch -d NUMBER_BRANCH_DESCRIPTION
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment