GIT: Understanding Git architecture and object model

Explaining the architecture and object model of GIT

Transcript

1. Pierre Goudjo Git Understanding Git architecture and object model
4. Seriously, what is Git?
5. Git is a Version Control System
7. Git is a distributed Version Control System
8. A CENTRALIZED VCS
9. A DISTRIBUTED VCS
10. A Distributed VCS (in practice)
11. Each repository contains all the commits and history locally
13. Just like it sounds, a "remote" is a repo outside your environment. Remotes
14. A Distributed VCS (in practice)
15. Cloning creates a remote called "origin" Remotes ~$ git clone http://some.repo.com someDirectory ~$ git branch -a * master remotes/origin/master
16. Where is the remote? Remotes ~$ git remote -v origin http://some.repo.com (fetch) origin http://some.repo.com (push)
17. A local branch may “track” a remote URL Remotes ~$ git branch -vv * master b956c45 [origin/master] Initial commit some-local-branch a74b295 Implemented that cool feature
18. Tracking Remotes
19. Tracking Remotes ~$ git checkout -b new-feature
20. Tracking Remotes ~$ git branch —set-upstream-to=origin/new-feature ~$ git checkout -b new-feature
21. Tracking Remotes ~$ git branch —set-upstream-to=origin/new-feature ~$ git branch -u origin/new-feature ~$ git checkout -b new-feature
22. Tracking Remotes ~$ git branch —set-upstream-to=origin/new-feature ~$ git branch -u origin/new-feature ~$ git push -u origin/new-feature ~$ git checkout -b new-feature
23. Tracking Remotes ~$ git branch —set-upstream-to=origin/new-feature ~$ git branch -u origin/new-feature ~$ git push -u origin/new-feature ~$ git checkout -b new-feature ~$ git checkout existing-branch-on-remote
24. Tracking Remotes ~$ git branch —set-upstream-to=origin/new-feature ~$ git branch -u origin/new-feature ~$ git push -u origin/new-feature ~$ git branch -vv master b956c45 [origin/master] Initial commit new-feature b956c45 [origin/new-feature] Initial commit
 * existing-branch-on-remote b956c45 [origin/existing-branch-on-remote] Another commit some-local-branch a74b295 Implemented that cool feature ~$ git checkout -b new-feature ~$ git checkout existing-branch-on-remote
25. A Distributed VCS (in practice)
26. What about other repos? How this is distributed?
27. A DISTRIBUTED VCS
28. Other Remotes Remotes ~$ git remote add another http://another.repo.fr ~$ git remote -v origin http://some.repo.com (fetch) origin http://some.repo.com (push) another http://another.repo.fr (fetch) another http://another.repo.fr (push)
30. What about the version control part?
31. The major di ff erence between Git and other VCS is the way they think about data
32. File states in Git
33. The staging area
34. CVS, SVN and others think of the information they store as a set of data and the changes made to each fi le over time Δ-based version control
35. Every time you commit Git takes a picture of what all your fi les look like at that moment Snapshot-based version control
36. Git store snapshots of directories and fi les Tree and Blob Objects
37. Git commit structure
38. Commit objects parents
39. HEAD pointer
40. Branches
41. git branch testing Branch
42. git checkout testing Branch change in Git
43. Tagging
44. git reset —hard Discard commits
45. git reset —hard Discard commits
46. git branch <branch>; git checkout <branch>; git checkout -b <branch> Commits and branches
47. git branch <branch>; git checkout <branch>; git checkout -b <branch> Commits and branches
48. git merge <branch> ; git merge <branch> — ff -only Fast-forward merge
49. git merge <branch> ; git merge <branch> — ff -only Fast-forward merge
50. git merge <branch>; git merge <branch> —no- f Merge commits
51. git merge <branch>; git merge <branch> —no- f Merge commits
52. Multiple merge commits
53. git rebase <branch> Rebasing
54. git rebase <branch> Rebasing
55. Fast forwarding rebased branch
56. git cherry-pick <commit_hash> Cherry-picking
57. git cherry-pick <commit_hash> Cherry-picking
59. @pierregoudjo The End