How to work on topics

  1. Head out from a common starting-point, usually in master
  2. git checkout -b topic
  3. Do your stuff, git commit, times 10.
  4. git checkout -b topic_squash
  5. git rebase master
  6. git rebase -i HEAD~10
If you release yourself:
  • git checkout master
  • git merge topic_squash
otherwise:
  • git push origin HEAD