Git introduction
0 likes927 views
The document is an introduction to Git, an open-source, distributed version control system designed for efficiency. It covers fundamental topics such as initializing a Git repository, branching, merging, and handling conflicts. Additionally, references for further learning, including links to videos and resources, are provided.
![Git Introduction
Dimitar Danailov
Senior Developer at 158ltd.com
dimityr.danailov[at]gmail.com
Slideshare.net
Github
YouTube
Founder at VarnaIT](https://image.slidesharecdn.com/gitintroduction-150222044246-conversion-gate01/85/Git-introduction-2-320.jpg)
![git checkout -b [branch_name]](https://image.slidesharecdn.com/gitintroduction-150222044246-conversion-gate01/85/Git-introduction-42-320.jpg)
![git checkout [branch_name]](https://image.slidesharecdn.com/gitintroduction-150222044246-conversion-gate01/85/Git-introduction-44-320.jpg)
![git merge [branch_name]](https://image.slidesharecdn.com/gitintroduction-150222044246-conversion-gate01/85/Git-introduction-46-320.jpg)
![Questions
Dimitar Danailov
Senior Developer at 158ltd.com
dimityr.danailov[at]gmail.com
Slideshare.net
Github
YouTube
Founder at VarnaIT](https://image.slidesharecdn.com/gitintroduction-150222044246-conversion-gate01/85/Git-introduction-76-320.jpg)
Git introduction
- 2. Git Introduction Dimitar Danailov Senior Developer at 158ltd.com dimityr.danailov[at]gmail.com Slideshare.net Github YouTube Founder at VarnaIT
- 4. Topics Today ● What is Git ? ● Git Init ● Git Branches ● Git Merging ● Git Conflicts
- 5. What is Git ?
- 6. Git is an open source, distributed version control system designed for speed and efficiency
- 7. Git is an open source, distributed version control system designed for speed and efficiency
- 9. Git is an open source, distributed version control system designed for speed and efficiency
- 10. Centralized source control vs distributed version control
- 12. Computer A Checkout File Central VSC Server Version Database Version 3 Version 2 Version 1
- 13. Computer A Checkout File Central VSC Server Version Database Version 3 Version 2 Version 1 Computer B Checkout File
- 15. Computer B Version Database Computer A Version Database Version 3 Version 2 Version 1 Version 1 Version 2 Version 3 Server Computer Version Database Version 3 Version 2 Version 1
- 17. (almost) everything is local
- 19. git log
- 20. git status
- 22. git config --global user.name “My Name”
- 23. git config --global user.email “[email protected]”
- 24. git config --global color.ui true
- 25. Create an empty Git repository
- 26. git init
- 29. touch hello_world.rb git add hello_world.rb git commit
- 33. Git Clone
- 36. Edit files vim / emacs / etc Stage the changes git add (file) Review your changes git status / git diff Commit the changes git commit A Basic Workflow
- 39. Git Branching
- 40. lightweight, movable pointers to a commit Branch C1
- 41. Snapshot
- 42. git checkout -b [branch_name]
- 43. git branch
- 45. git diff
- 51. Head git branch i18n Master i18n fb4d2f8 $ git branch * master * i18n
- 52. git branch i18n fb4d2f8 Head i18n $ git branch * master * i18n Master
- 55. git checkout -b iss53 master fb4d2f8 Master e1c6bf1 Head i18n 32ac6d1
- 56. git checkout master; git checkout -b iss53 fb4d2f8 Master e1c6bf1 i18n 32ac6d1 Head iss53
- 58. Merging
- 62. Snapshot
- 67. fb4d2f8 Master e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 iss53Head git merge i18n We need a new tree
- 68. fb4d2f8 Master e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 iss53Head git merge i18n Lock History and find best merge base
- 69. fb4d2f8 Master e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 iss53Head git merge i18n c3d Readme.tx f13 Hello.c c3d Readme.tx 9ec Hello.c 3ab i18n.c c3d Readme.tx f13 Hello.c 5ff issue.c
- 70. fb4d2f8 Master e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 iss53Head git merge i18n c3d Readme.tx f13 Hello.c c3d Readme.tx 9ec Hello.c 3ab i18n.c c3d Readme.tx f13 Hello.c 5ff issue.c
- 71. Master e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 iss53Head git merge i18n c3d Readme.tx 9ec Hello.c 3ab i18n.c c3d Readme.tx f13 Hello.c 5ff issue.c fb4d2f8c3d Readme.tx f13 Hello.c fb4d2f8c3d Readme.tx 9ec Hello.c 5ff issue.c 3ab i18n.c
- 72. iss53 e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 master git merge i18n c3d Readme.tx 9ec Hello.c 3ab i18n.c c3d Readme.tx f13 Hello.c 5ff issue.c fb4d2f8c3d Readme.tx f13 Hello.c fb4d2f8c3d Readme.tx 9ec Hello.c 5ff issue.c 3ab i18n.c Head
- 73. iss53 e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 master git merge i18n fb4d2f8 954cba1 Head
- 75. ● https://www.youtube.com/watch?v=ZDR433b0HJY&list=PLH2J_JZ4HZUtsholk1M9tQintjo-4rV8j ● http://git-scm.com/ ● http://git-scm.com/book/en/v2/Git-Basics-Viewing-the-Commit-History
- 76. Questions Dimitar Danailov Senior Developer at 158ltd.com dimityr.danailov[at]gmail.com Slideshare.net Github YouTube Founder at VarnaIT