Git

Transcript

1. Git Fork, Branch, Rebase, Squash and Flow oh my Shawn Jonnet <sjonnet@gmail.com>
2. Overview • Fork and Branch • Rebase • Squash • Flow
3. Fork and Branch • Forking is useful for creating a repository to maintain branches that you don't want or are not yet ready to share. • Branching for feature and bug fixing helps keep work isolated from more stable branches and allows the developer to commit often and push often.
4. git checkout -b feature/<feature>
5. Rebase • Rebase was designed to specifically help with the sequence of code commits and progress. Have you looked at your commit history?
6. git rebase master
7. Squash • Squash? Wait what this is intended to create clean commit's so it makes code reviews easier.
8. git reset HEAD~[1-9*] && git add . && git commit -m 'Clean commit'
9. Flow • Release • Hotfix • Feature
10. git flow feature (start|finish) 0.0.1
11. git flow release (start|finish) 0.0.1
12. git flow hotfix (start|finish) 0.0.1