Git introduction

•

0 likes•917 views

This talk introduces the Git Version Control System by looking at what Git is doing when you run the commands you need to do basic version control with it. We'll look at how to use Git to do the basics, while seeing how it differs from Subversion, what staging and committing actually looks like, how it stores it's data, how it branches and merges so nicely and how it talks to a server when pushing and fetching. Then we'll look at how to look at your history with log in interesting ways.

Software

Git Introduction
Dimitar Danailov
Senior Developer at 158ltd.com
dimityr.danailov[at]gmail.com
Slideshare.net
Github
YouTube
Founder at VarnaIT

Topics Today
● What is Git ?
● Git Init
● Git Branches
● Git Merging
● Git Conflicts

Git is an open source,
distributed version control
system designed for speed
and efficiency

Centralized source control
vs
distributed version control

Computer A
Checkout
File
Central VSC Server
Version Database
Version 3
Version 2
Version 1

Computer A
Checkout
File
Central VSC Server
Version Database
Version 3
Version 2
Version 1
Computer B
Checkout
File

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

git config --global user.email
“myemail@example.com”

touch hello_world.rb
git add hello_world.rb
git commit

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

lightweight, movable
pointers to a commit
Branch
C1

Master
Commit
fb4d2f8
Head
Head is
pointer to
current
branch

Head
git branch i18n
Master
i18n
fb4d2f8

Head
git branch i18n
Master
i18n
fb4d2f8
$ git branch
* master
* i18n

git branch i18n
fb4d2f8
Head
i18n
$ git branch
* master
* i18n
Master

git commit
fb4d2f8
Head
i18n
Master
e1c6bf1

git checkout -b iss53 master
fb4d2f8
Master
e1c6bf1
Head
i18n
32ac6d1

git checkout master;
git checkout -b iss53
fb4d2f8
Master
e1c6bf1
i18n
32ac6d1
Head
iss53

fb4d2f8
Master
e1c6bf1
i18n
32ac6d1
k134ab1 a18cea1
iss53Head
git commit

fb4d2f8
Master
e1c6bf1
i18n
32ac6d1
k134ab1 a18cea1
iss53
Head
git checkout master

fb4d2f8
Master
e1c6bf1
i18n
32ac6d1
k134ab1 a18cea1
iss53
Head
git merge iss53

fb4d2f8
Master
e1c6bf1
i18n
32ac6d1
k134ab1 a18cea1
iss53Head
git merge i18n

fb4d2f8
Master
e1c6bf1
i18n
32ac6d1
k134ab1 a18cea1
iss53Head
git merge i18n
We need a
new tree

fb4d2f8
Master
e1c6bf1
i18n
32ac6d1
k134ab1 a18cea1
iss53Head
git merge i18n
Lock History
and find best
merge base

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

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

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

iss53
e1c6bf1
i18n
32ac6d1
k134ab1 a18cea1
master
git merge i18n
fb4d2f8 954cba1
Head

● 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

Questions
Dimitar Danailov
Senior Developer at 158ltd.com
dimityr.danailov[at]gmail.com
Slideshare.net
Github
YouTube
Founder at VarnaIT

Viewers also liked

ASP.NET MVC - Knockoutjs and MVVMDimitar Danailov

ASP.NET - Architecting single page applications with knockout.jsDimitar Danailov

Angularjs PerformanceSteven Lambert

Mongo DB Terms - Mentormate AcademyDimitar Danailov

Microservices - Code Voyagers SofiaDimitar Danailov

HackConf2015 - Ruby on Rails: Unexpected journeyDimitar Danailov

HackConf2016 - Ruby on Rails: Unexpected journeyDimitar Danailov

Viewers also liked (7)

ASP.NET MVC - Knockoutjs and MVVM

ASP.NET - Architecting single page applications with knockout.js

Angularjs Performance

Mongo DB Terms - Mentormate Academy

Microservices - Code Voyagers Sofia

HackConf2015 - Ruby on Rails: Unexpected journey

HackConf2016 - Ruby on Rails: Unexpected journey

Similar to Git introduction

Introduction to Git.pptxgdscuds

Pro git - grasping it conceptuallyseungzzang Kim

Git 入门与实践Terry Wang

GitTerry Wang

Git with the flowDana White

Git workflows automat-itAutomat-IT

Managing e commerce systems codebase with gitBruno Ricardo Siqueira

Git Commands Every Developer Should Know?9 series

Git & githubMohamed Abdallah

Introduction to git, an efficient distributed version control systemAlbanLevy

Working with GitPete Nicholls

Git basics to advance with diagramsDilum Navanjana

Getting Started with GitRick Umali

M.Mozūras - gitAgile Lietuva

Managing releases effectively through gitMohd Farid

Git For The Android DeveloperEffective

Git Magic: Versioning Files like a Bosstmacwilliam

Tech thursdays / GITMarek Prochera

Introduction to Git (Greg Lonnon)Boise Web Technologies Group

Wokshop de Git Alberto Leal

Similar to Git introduction (20)

Introduction to Git.pptx

Pro git - grasping it conceptually

Git 入门与实践

Git

Git with the flow

Git workflows automat-it

Managing e commerce systems codebase with git

Git Commands Every Developer Should Know?

Git & github

Introduction to git, an efficient distributed version control system

Working with Git

Git basics to advance with diagrams

Getting Started with Git

M.Mozūras - git

Managing releases effectively through git

Git For The Android Developer

Git Magic: Versioning Files like a Boss

Tech thursdays / GIT

Introduction to Git (Greg Lonnon)

Wokshop de Git

Recently uploaded

DNT_Corporate presentation know about usDynamic Netsoft

Building a General PDE Solving Framework with Symbolic-Numeric Scientific Mac...stazi3110

Optimizing AI for immediate response in Smart CCTVshikhaohhpro

The Ultimate Test Automation Guide_ Best Practices and Tips.pdfkalichargn70th171

Unveiling the Tech Salsa of LAMs with Janus in Real-Time ApplicationsAlberto González Trastoy

Call Girls In Mukherjee Nagar 📱 9999965857 🤩 Delhi 🫦 HOT AND SEXY VVIP 🍎 SE...Call Girls In Delhi Whatsup 9873940964 Enjoy Unlimited Pleasure

Alluxio Monthly Webinar | Cloud-Native Model Training on Distributed DataAlluxio, Inc.

Unlocking the Future of AI Agents with Large Language Modelsaagamshah0812

Project Based Learning (A.I).pptx detail explanationkaushalgiri8080

EY_Graph Database Powered SustainabilityNeo4j

Unit 1.1 Excite Part 1, class 9, cbse...aditisharan08

BATTLEFIELD ORM: TIPS, TACTICS AND STRATEGIES FOR CONQUERING YOUR DATABASEOrtus Solutions, Corp

5 Signs You Need a Fashion PLM Software.pdfWave PLM

Short Story: Unveiling the Reasoning Abilities of Large Language Models by Ke...kellynguyen01

Introduction to Decentralized Applications (dApps)Intelisync

why an Opensea Clone Script might be your perfect match.pdfjoe51371421

A Secure and Reliable Document Management System is Essential.docxComplianceQuest1

Cloud Management Software Platforms: OpenStackVICTOR MAESTRE RAMIREZ

Learn the Fundamentals of XCUITest Framework_ A Beginner's Guide.pdfkalichargn70th171

Try MyIntelliAccount Cloud Accounting Software As A Service Solution Risk Fre...MyIntelliSource, Inc.

Recently uploaded (20)

DNT_Corporate presentation know about us

Building a General PDE Solving Framework with Symbolic-Numeric Scientific Mac...

Optimizing AI for immediate response in Smart CCTV

The Ultimate Test Automation Guide_ Best Practices and Tips.pdf

Unveiling the Tech Salsa of LAMs with Janus in Real-Time Applications

Call Girls In Mukherjee Nagar 📱 9999965857 🤩 Delhi 🫦 HOT AND SEXY VVIP 🍎 SE...

Alluxio Monthly Webinar | Cloud-Native Model Training on Distributed Data

Unlocking the Future of AI Agents with Large Language Models

Project Based Learning (A.I).pptx detail explanation

EY_Graph Database Powered Sustainability

Unit 1.1 Excite Part 1, class 9, cbse...

BATTLEFIELD ORM: TIPS, TACTICS AND STRATEGIES FOR CONQUERING YOUR DATABASE

5 Signs You Need a Fashion PLM Software.pdf

Short Story: Unveiling the Reasoning Abilities of Large Language Models by Ke...

Introduction to Decentralized Applications (dApps)

why an Opensea Clone Script might be your perfect match.pdf

A Secure and Reliable Document Management System is Essential.docx

Cloud Management Software Platforms: OpenStack

Learn the Fundamentals of XCUITest Framework_ A Beginner's Guide.pdf

Try MyIntelliAccount Cloud Accounting Software As A Service Solution Risk Fre...

Git introduction

1. Git Introduction @d_danailov

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

11. Centralized source 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

14. distributed version control

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

16. Fully Distributed

17. (almost) everything is local

18.

19. git log

20. git status

21. Git Configurations

22. git config --global user.name “My Name”

23. git config --global user.email “myemail@example.com”

24. git config --global color.ui true

25. Create an empty Git repository

26. git init

27.

28.

29. touch hello_world.rb git add hello_world.rb git commit

30.

31.

32.

33. Git Clone

34. git clone https://github.com/git/git

35.

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

37.

38. Git Version Number

39. Git Branching

40. lightweight, movable pointers to a commit Branch C1

41. Snapshot

42. git checkout -b [branch_name]

43. git branch

44. git checkout [branch_name]

45. git diff

46. git merge [branch_name]

47. Master Commit fb4d2f8

48. Master Commit fb4d2f8 Head Head is pointer to current branch

49. Head git branch i18n Master fb4d2f8

50. Head git branch i18n Master i18n fb4d2f8

51. Head git branch i18n Master i18n fb4d2f8 $ git branch * master * i18n

52. git branch i18n fb4d2f8 Head i18n $ git branch * master * i18n Master

53. git commit fb4d2f8 Head i18n Master e1c6bf1

54. git commit fb4d2f8 Head i18n Master e1c6bf1

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

57. fb4d2f8 Master e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 iss53Head git commit

58. Merging

59. fb4d2f8 Master e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 iss53 Head git checkout master

60. fb4d2f8 Master e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 iss53 Head git merge iss53

61. fb4d2f8 Master e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 iss53 Head git checkout master

62. Snapshot

63. fast-forward merge

64. fb4d2f8 Master e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 iss53Head git merge iss53

65. fb4d2f8 Master e1c6bf1 i18n 32ac6d1 k134ab1 a18cea1 iss53Head git merge i18n

66. non fast-forward merge

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

74.

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

Git introduction

Recommended

Recommended

More Related Content

Viewers also liked

Viewers also liked (7)

Similar to Git introduction

Similar to Git introduction (20)

More from Dimitar Danailov

More from Dimitar Danailov (20)

Recently uploaded

Recently uploaded (20)

Git introduction