Skip to content

Instantly share code, notes, and snippets.

@l1x
Created February 20, 2014 17:33
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save l1x/9119112 to your computer and use it in GitHub Desktop.
Save l1x/9119112 to your computer and use it in GitHub Desktop.
git checkout -b bug/fix-description 1.0.x
#do stuff
#gc --amend -a
git checkout 1.0.x
git merge bug/fix-description
git tag -a -m "1.0.1 release" 1.0.1
#merging back to master
git checkout -b merge/1.0.x-master master
git merge 1.0.x
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment