The document provides an overview of Git and version control. It discusses how Git allows for snapshots of files and safe experimentation. It then covers the basics of Git including configuring user information, cloning repositories, adding and committing files, branching and merging, and sharing changes through pushes. The presentation aims to introduce developers to the fundamentals of using Git and its various commands and features.

1. #CLUS

2. Ashley Roach
Principal Engineer Evangelist
DEVNET-1080
Introduction to Git

3. Agenda
© 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
• Introduction
• Quick overview of Git
• Workshop
• Resources
3DEVNET-1080

4. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
WHY AREWE HERE?
It’s kindof like:
- Snapshots ofVMs
- Incremental backups of files
- Wiki versioning
When you make a mistake or want to
do some experimenting, you can do that in
a safe way
5DEVNET-1080

5. Why version control?To
Protect yourself and
others

6. What does this have to do
with Networking or Data
Center?

7. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
NetDevOps CICD Pipeline Demonstration
Create Proposed Branch Update Configuration Test Configuration Push Proposed Changes
Build Automation StartsBuild Test NetworkDeploy Changes and
Test
Send
Notification
Automated Pipeline Credit: Hank Preston
DEVNET-1080 8DEVNET-1080

8. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
Git vs. GitHub
Git is an open source
distributed version control
system / technology
GitHub is a commercial
company, that runs
GitHub.com based on Git
VCS
9DEVNET-1080

9. Git:TechnicalOverview

10. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
DISTRIBUTED VERSION CONTROL
• Opens up to new workflows: git flow
• Each system has an exact replica of the repo as other collaborators.
https://git-scm.com/images/about/workflow-b@2x.png
11DEVNET-1080

11. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
Under the hood
• Changes are stored in trees
• Trees contain changed files
• Commits contain trees
http://git-scm.com/figures/18333fig0903-tn.png
12DEVNET-1080

12. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
Getting Started with Git Starting from GitHub (screenshot flow of new project)
Starting from your workstation (git init)
13DEVNET-1080

13. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
Getting Started with CLI: GIT CONFIG
• So you can be held accountable, configure git
$ git config --global user.name "Your Name Comes Here"
$ git config --global user.email you@yourdomain.example.com
14DEVNET-1080

14. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
Getting Started: Cloning Projects
• No password
• Set up SSH key on remote server (e.g. ssh-keygen)
$ git clone git@github.com:aroach/upgraded-guacamole.git
$ git clone https://github.com/aroach/upgraded-guacamole.git
15DEVNET-1080

15. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
Getting Started: Local Repository
16DEVNET-1080

16. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
What’s inside .git?
17DEVNET-1080

17. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS 19DEVNET-1080

18. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
GIT ADD
• Add any files in your repository to git “stage”
$ git add .
https://git-scm.com/images/about/index1@2x.png
21DEVNET-1080

19. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
STAGING AREA
Hat tip: @GeorgiaReh
22DEVNET-1080

20. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
GIT COMMIT
• Store your changes into a commit
• Saves all of your changes together / save point
• Commit does NOT push
$ git commit –m ’Initial commit’
23DEVNET-1080

21. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
Git Log: History of commits
24DEVNET-1080

22. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
BRANCHING:Your safe place
• Makes a pointer to your
code
• Moves HEAD around
http://git-scm.com/figures/18333fig0307-tn.png
$ git branch <name>
$ git branch testing
$ git commit –m “new”
$ git checkout master
25DEVNET-1080

23. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
MERGING
• git merge <topic>
• You must be on the branch you want to merge INTO when you execute this
command (e.g. master)
$ git merge <branch>
26DEVNET-1080

24. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
GOING BACKWARDS
• Generate a new commit that undoes all of the changes introduced in
<commit>, then apply it to the current branch.
$ git revert <commit>
27DEVNET-1080

25. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
SHAREYOUR CHANGES
• git push <destination> <branch>
• git push origin master
$ git remote add <name> <url>
$ git push <name> <branch>
$ git push origin master
28DEVNET-1080

26. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
GIT CLIENTS
• CLI Client
• IDE Clients
• VIM: airblade/vim-gitgutter
• Emacs: magit
• GUI Clients
• SourceTree
• Git Kracken
29DEVNET-1080

27. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS 32DEVNET-1080

28. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS 33DEVNET-1080

29. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
Come find me after today… I’ll be waiting
Ashley Roach
• asroach@cisco.com
• @aroach
• http://github.com/aroach
• http://linkedin.com/in/ashleyroach
Cisco DEVNET
• @CiscoDevNet
• http://github.com/CiscoDevNet
34DEVNET-1080

30. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
Cisco WebexTeams
Questions?
Use Cisco Webex Teams (formerly Cisco Spark)
to chat with the speaker after the session
Find this session in the Cisco Live Mobile App
Click “Join the Discussion”
Install Webex Teams or go directly to the team space
Enter messages/questions in the team space
How
Webex Teams will be moderated
by the speaker until June 18, 2018.
cs.co/ciscolivebot# DEVNET-1080
© 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public 35
1
2
3
4
35

31. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
Complete your online session evaluation
© 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
Give us your feedback to be entered into a
Daily Survey Drawing.
Complete your session surveys through the
Cisco Live mobile app or on
www.CiscoLive.com/us.
Don’t forget: Cisco Live sessions will be available for viewing on
demand after the event at www.CiscoLive.com/Online.
36Presentation ID

32. © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS © 2018 Cisco and/or its affiliates. All rights reserved. Cisco Public#CLUS
Demos in
the Cisco
campus
Walk-in
self-paced
labs
Meet the
engineer
1:1
meetings
Related
sessions
Continue
your
education
Presentation ID 37

33. Thank you
#CLUS 38Presentation ID

34. #CLUS