Skip to content

Instantly share code, notes, and snippets.

@apricot13
Created January 8, 2015 12:33
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save apricot13/0e649180905d18e3fda2 to your computer and use it in GitHub Desktop.
Save apricot13/0e649180905d18e3fda2 to your computer and use it in GitHub Desktop.
Git: Feature branch workflow
git checkout -b feature-branch master
git status
git add <some-file>
git commit
git push -u origin feature-branch
git push
git checkout master
git pull
git pull origin feature-branch
git push
@apricot13
Copy link
Author

git checkout -b feature-branch master
 
git status
git add <some-file>
git commit
 
git push -u origin feature-branch
git push
 

// rebase
git checkout master
git pull
git checkout feature-branch
git rebase origin/master
git push --force -u origin feature-branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment