1. GIT DEMO
Tingting Dong
tingdong@cisco.com

2. Agenda
• Why Git
• Git Repo
• Git Branch
• Rebase and Merge
• Common scenarios
• Q&A

3. Why Git
• Git is a free distributed version control
system
• Git can use in local
• Git is easy and fast to switch branch

4. Git Repo
• Workspace
– Include all physical files
• Index
– Save all temporary changes
• HEAD
– It’s a pointer, point to the latest commit in your
current branch

5. Git Repo

6. Branch management
a.file
b.file
a’.file
b.file
Integrate
Commit A
New branch
Commit B

7. Git rebase and Git merge
integrate
Feature branch
A1 A2
B1 B2 B3

8. Git merge
integrate
Feature branch
A1 A2
B1 B2 B3
B1 B2 B3

9. Git rebase
integrate
Feature branch
A1 A2
B1 B2 B3

10. Git rebase
integrate
Feature branch
A1 A2
B1 B2 B3

11. Git rebase
integrate
Feature branch
A1 A2
A1 A2
B1 B2 B3

12. Git rebase
integrate
Feature branch
A1 A2
A1 A2 B’1 B’2 B’3

13. Git rebase and Git merge
• Use rebase
– Your branch are local branch, No remote branch
• Use merge
– All other situations

14. QUESTIONS?