7. Terms
• commit - group of saved modifications
• remote - object which exists in a remote
repository
• stash - unit of uncommitted changes
• tags - pointer to a specific commit in a specific
branch
• can mark versions / milestones
8. Terms
• push - upload changes made on the local
repository to a remote repo / branch
• pull - download changes from a remote repo /
branch to a local branch
9. Common Actions
• Check status
• Add changes to staging area
• Stash changes
• Commit staged changes
• Push commits
11. Merging vs Rebase
• Merge - maintains commit history
• Rebase - squashes many commits into 1
12. Basic Workflow
• Make some changes
• Stage changes
• Commit changes
• Push to remote (optional)
13.
14. Well, actually…
1. Create / Clone / Merge
2. Create new feature / issue branch
3. Make some changes
4. Stage & commit changes
5. Go back to 3
6. Submit for code review / Merge / Push
7. Go to 1