This document discusses Git data models and branches. It covers the basics of Git branches including creating, switching, merging and rebasing branches. It also discusses tracking branches and pushing branches to remote repositories. Key points covered include Git's commit-based data model, creating branches off the HEAD, fast-forwarding merges, tracking local and remote branches, pushing and deleting branches remotely, and the differences between merging and rebasing branches.

1. Git
Git Data Model & Branch
Liu Lin

2. Git data model

3. ❖ Git Data Model
init.rb
my_plugin.rb
base_include.rb
lib
base

4. ❖ Git Data Model
init.rb
my_plugin.rb
base_include.rb
lib
base

5. ❖ Git Data Model
init.rb
my_plugin.rb
base_include.rb
lib
base

6. ❖ Git Data Model

7. Branch
❖ Branches in a Nutshell
❖ Basic Branching
❖ Remote Branches
❖ Merge VS Rebase

8. git add README test.rb LICENSE
git commit -m 'initial commit of my project'
❖ A commit and its tree

9. ❖ Commits and their parents

10. ❖ A branch and its commit history

11. Branch
❖ Branches in a Nutshell
❖ Basic Branching
❖ Remote Branches
❖ Merge VS Rebase

12. ❖ Create New Branch
git checkout -b iss53
HEAD
HEAD

13. ❖ Switch Branch
git checkout master
git checkout -b hotfix
git commit -a -m 'fixed C4'
git commit -a -m 'added C3'
HEAD
HEAD

14. ❖ Fast-forward Merge
git branch -b hotfix
git checkout iss53
git commit -a -m 'added C5'
git checkout master
git merge hotfix
HEAD
HEAD

15. Branch
❖ Branches in a Nutshell
❖ Basic Branching
❖ Remote Branches
❖ Merge VS Rebase

16. ❖ Server and local repositories after cloning

17. ❖ Local and remote work can diverge

18. ❖ Git fetch updates your remote references

19. ❖ Track Branches
git branch -l *master
git branch -r origin/master
origin/test
git checkout test
Branch test set up to track remote
branch test from origin.
Switched to a new branch 'test'
git branch -a
master
* test
remotes/origin/master
remotes/origin/test

20. ❖ Track Branches
git branch -l
*master
test
git branch -r
origin/master
origin/test
git branch -u origin/test test
Branch test set up to track remote
branch test from origin.
git branch -vv
test 7e424c3 [origin/test] forgot the brackets
*master 1ae2a45 [origin/master] commit once

21. ❖ Push
git push origin 60e4ff:master
To https://github.com/liulin/test.git
60e4ff -> master
To https://github.com/liulin/test.git
* [new branch] b1 -> b1
git push origin b1:b1
git push origin --delete b1
To https://github.com/liulin/test.git
- [deleted] b1

22. Branch
❖ Branches in a Nutshell
❖ Basic Branching
❖ Remote Branches
❖ Merge VS Rebase

23. ❖ Merge
git merge iss53
git checkout master
C6

24. ❖ Rebase
git rebase master
git checkout experiment

25. Git …continue …….