git flow memo

See also

• https://gitlab.com/JBodineau/git-memo

• git flow memo introduction
  • Good practices
  • Branches model and git architecture
• Basic git flow memo
  • Init/clone repository
  • Check the state of our local repository
  • Change the current working branch
  • Update our local branches definition
  • Create a new branch
  • Merge a branch
  • Commit some code
  • Modify the previous commit
  • Push our code/new branch to the remote repository
  • Keep our branch updated : get the remote repository changes
  • Cancel our modifications (back to last commit)
  • Record our changes and restore them
  • Manage tags
• Advanced git flow memo
  • Revert the state of our branch (undo changes and commits)
  • Rebase our current branch onto another branch
  • Rebase our code when pulling changes of the current branch
  • Use git flow