** DevOps Training: https://www.edureka.co/devops ** This Edureka Git Tutorial explains what is version control system and why Git is the best tool for version control. You will get to learn what is Git through various operations that Git supports. Below are the topics covered in the tutorial: 1. Version Control System 2. Types of Version Control System 3. Version Control System Tools 4. What is Git? 5. Git Features 6. Git Workflow 7. Parallel Development 8. Hands-On Check our complete DevOps playlist here (includes all the videos mentioned in the video): http://goo.gl/O2vo13

2. Devops Certification Training www.edureka.co/devops
Topics For Today’s Session
Version Control System
Version Control System Types
Version Control Tools
Git Workflow
Parallel Development & Stashing
Hands-On
1
2
3
4
5
6

3. Copyright © 2018, edureka and/or its affiliates. All rights reserved.
Scenario From Company

4. Devops Certification Training www.edureka.co/devops
Scenario Of A Company
I hope client
likes this new
feature!

5. Devops Certification Training www.edureka.co/devops
Scenario Of A Company
Sure! I will
remove this
feature
I do not like it!
So please
remove this
feature

6. Devops Certification Training www.edureka.co/devops
Scenario Of A Company
But I have already
deleted that code! I
have to re write the
whole code again
Hey! I want
that feature
back!

7. Devops Certification Training www.edureka.co/devops
Once saved, all
changes are
permanent and
can’t be reverted
back.
Downtime may
occur due to
faulty updates,
since there is no
backup
maintained
No collaboration
between the
team. So no
records are
maintained.
Chaos Caused Without Version Control

8. Copyright © 2018, edureka and/or its affiliates. All rights reserved.
Version Control

9. Devops Certification Training www.edureka.co/devops
Version Control System
Version control is the
management of changes
to documents, computer
programs, large web sites,
and other collections of
information.
These changes are usually
termed as “versions”.

10. Copyright © 2018, edureka and/or its affiliates. All rights reserved.
Version Control Types

11. Devops Certification Training www.edureka.co/devops
Version Control Types
Distributed Version Control SystemCentralized Version Control System
Repository
Repository Repository Repository
Working Copy Working Copy Working Copy
Workstation/
PC #1
Workstation/
PC #2
Workstation/
PC #3
Commit
Update
Commit
Update
Commit
Update
Push
Pull
Server
Repository
Working Copy Working Copy Working Copy
Workstation/
PC #1
Workstation/
PC #2
Workstation/
PC #3
Server
Commit
Update

12. Devops Certification Training www.edureka.co/devops
Version Control System Tools
Version control has various tools like Git, Apache Subversion, Concurrent Version Systems, Team
Foundation Server, Mercurial etc.

13. Devops Certification Training www.edureka.co/devops
Released under GPL’s
license. It is for free and is
open source.
Why Git wins over other tools?
Economical Non -Linear Snapshots Distributed
Speed Robust Integrity Branching

14. Devops Certification Training www.edureka.co/devops
Released under GPL’s
license. It is for free and is
open source.
Supports non-linear
development of software.
Why Git wins over other tools?
Economical Non -Linear Snapshots Distributed
Speed Robust Integrity Branching

15. Devops Certification Training www.edureka.co/devops
Released under GPL’s
license. It is for free and is
open source.
Supports non-linear
development of software.
Records changes made to
a file rather than file itself.
Why Git wins over other tools?
Economical Non -Linear Snapshots Distributed
Speed Robust Integrity Branching

16. Devops Certification Training www.edureka.co/devops
Released under GPL’s
license. It is for free and is
open source.
Supports non-linear
development of software.
Records changes made to
a file rather than file itself.
Every user has his own
copy of the repository
data stored locally.
Why Git wins over other tools?
Economical Non -Linear Snapshots Distributed
Speed Robust Integrity Branching

17. Devops Certification Training www.edureka.co/devops
Released under GPL’s
license. It is for free and is
open source.
Supports non-linear
development of software.
Records changes made to
a file rather than file itself.
Every user has his own
copy of the repository
data stored locally.
Speed offered by Git is
lightening fast compared
to other VCS’s.
Why Git wins over other tools?
Economical Non -Linear Snapshots Distributed
Speed Robust Integrity Branching

18. Devops Certification Training www.edureka.co/devops
Released under GPL’s
license. It is for free and is
open source.
Supports non-linear
development of software.
Records changes made to
a file rather than file itself.
Every user has his own
copy of the repository
data stored locally.
Speed offered by Git is
lightening fast compared
to other VCS’s.
Why Git wins over other tools?
Nearly every task in Git is
undo-able.
Economical Non -Linear Snapshots Distributed
Speed Robust Integrity Branching

19. Devops Certification Training www.edureka.co/devops
Released under GPL’s
license. It is for free and is
open source.
Supports non-linear
development of software.
Records changes made to
a file rather than file itself.
Every user has his own
copy of the repository
data stored locally.
Speed offered by Git is
lightening fast compared
to other VCS’s.
No changes can be made
without Git recording it.
Why Git wins over other tools?
Nearly every task in Git is
undo-able.
Economical Non -Linear Snapshots Distributed
Speed Robust Integrity Branching

20. Devops Certification Training www.edureka.co/devops
Released under GPL’s
license. It is for free and is
open source.
Supports non-linear
development of software.
Records changes made to
a file rather than file itself.
Every user has his own
copy of the repository
data stored locally.
Speed offered by Git is
lightening fast compared
to other VCS’s.
No changes can be made
without Git recording it.
Why Git wins over other tools?
Nearly every task in Git is
undo-able.
Every collaborator’s
working directory is in
itself a branch.
Economical Non -Linear Snapshots Distributed
Speed Robust Integrity Branching

21. Devops Certification Training www.edureka.co/devops
Released under GPL’s
license. It is for free and is
open source.
Supports non-linear
development of software.
Records changes made to
a file rather than file itself.
Every user has his own
copy of the repository
data stored locally.
Speed offered by Git is
lightening fast compared
to other VCS’s.
No changes can be made
without Git recording it.
Why Git wins over other tools?
Nearly every task in Git is
undo-able.
Every collaborator’s
working directory is in
itself a branch.
Economical Non -Linear Snapshots Distributed
Speed Robust Integrity Branching

22. Devops Certification Training www.edureka.co/devops
What is Git?
Git is an open source Distributed Version Control System(DVCS) which records changes made to
the files laying emphasis on speed, data integrity and distributed, non-linear workflows

23. Devops Certification Training www.edureka.co/devops
Workflow of Git

24. Devops Certification Training www.edureka.co/devops
Workflow Of Git

25. Copyright © 2018, edureka and/or its affiliates. All rights reserved.
Parallel Development

26. Devops Certification Training www.edureka.co/devops
Branching
Branching is an integral part of any Version Control(VC) System. Unlike other VC’s Git does not
create a copy of existing files for new branch. It points to snapshot of the changes you have
made in the system

27. Devops Certification Training www.edureka.co/devops
Merging
Merging integrates the changes made in different branches into one single branch

28. Devops Certification Training www.edureka.co/devops
Rebasing
Used when changes made in one branch needs to be reflected in another branch

29. Copyright © 2018, edureka and/or its affiliates. All rights reserved.
Stashing

30. Devops Certification Training www.edureka.co/devops
Stashing
Used when changes made in one branch needs to be reflected in another branch

31. Copyright © 2018, edureka and/or its affiliates. All rights reserved.
Hands-On

32. Devops Certification Training www.edureka.co/devops
Hands-On – Problem Statement
Company want a better
Source Code Management
System because the earlier
tool had the tendency to save
redundant code. Multiple
Developers working
simultaneously on same block
of code also caused problems.

33. Devops Certification Training www.edureka.co/devops
Hands-On – Solution
Task is to move the
company’s code base to
git and Github.

34. Devops Certification Training www.edureka.co/devops
Git Commands
Basic Commands
sudo apt-get install git git config --global user.name “username”
git initgit add <filename> git status git commit git diff
git rm <filename>
git rm --cached <filename>
git rm -f <filename>
git log
git tag --a <annotation> --m <message>
git add remote origin <remote link>
git tag
git show <tag-name>
git push origin master
git push origin --tags
git pull origin
git fetch origin

35. Devops Certification Training www.edureka.co/devops
Git Commands
git stash pop
git stash save ‘message’ git stash list git stash apply <stash id>
git stash drop <stack id> git stash clear
Stashing Commands
Branching Commands
git branch <branchname> git checkout <branchname>
git branch -D <branchname>git branch -d <branchname>
git merge <branchname>
git branch