My GIT workflow on github

January 1, 2016

Happy new year. I’ve just started to hack on a driver for the NodeMCU board. And, once again, I forgot my github workflow. So, here is it again (for me).

  • Clone my fork from github
  • Enter the upstream repo as remote
    git remote add upstream <url>
  • Create a local branch for my development
    git checkout -b <branchname>
  • Commit locally whenever needed and push to my origin
    git commit -m "....."
    git push origin
  • Rebase my repo to useful commits
    git rebase -i HEAD~<number of commits>
  • Rebase to upstream repo with my changes on top (master branch)
    git fetch upstream
    git rebase upstream/master
    git push -f origin master
  • Send pull-request


comments powered by Disqus