The document provides an overview of using Git for version control, including how to acquire Git, how it works, common Git commands ("verbs"), tools for using Git, and strategies for using Git in a work environment. It discusses setting up a Git repository, the Git object model, branches, merging, tagging, and tools like GitHub and Visual Studio Team Services.

1. Mastering Git
www.staticvoidpodcast.com
Chris Gomez
@SpaceShot
chris@chrisgomez.com
www.chrisgomez.com

2. Mastering Git
•Acquiring Git inWindows
•How GitWorks
•Git “Verbs”
•GitTools
•Using Git atWork
•GitHub
•Visual StudioTeam Services

3. Philly.NET Code Camp Friday
•Workday for Microsoft
•Morning: Bagels / Coffee / Drinks come to rooms
•Lunch: Escorted to lunch line, eat in room
•Snack: Pretzels / Drinks come to rooms
•No room switching
•Restrooms

4. Acquiring Git
#WindowsProblems

5. …and more!
•Git forWindows
•Posh-Git
•GitHub Desktop
•Visual Studio
Acquiring Git
#WindowsProblems

6. How GitWorks

7. What is Git Anyways?

8. What is Git Anyways?
•“DistributedVersion Control”
•“Content Addressable File System”
•“A Directed Acyclic Graph”

9. How GitWorks
•The Git Folder
•The Git Internal Model
•The Commit Graph
For now, let’s ignore the big phrases
and focus on some easy concepts:

10. The Git Folder
How DoYou Create A Repository?

11. Creating a Repository
md .git
cd .git
md objects
md refs
md refsheads
copy con HEAD
ref: refs/heads/master^Z

12. Creating a Repository
Git FromThe Bits Up
https://www.youtube.com/watch?v=mdvlu_R8EWE

13. Creating a Repository
git init
Just Kidding… use:

14. The Git Internal Model
How Does Git Store Content?

15. The Git Internal Model
For any value, Git simply creates a SHA1
hash, and that’s the key it uses to store the
value

16. git hash-object
echo Hello World | git hash-object –-stdin
61bf8b2fc819641b01d63266e72517b305608995

17. ContentAddressable File System
For all objects, from blobs to trees to
commits, git cares about the content.

18. .
“saved code camps” favorite_
codeca
mp.txt
miami.txt
wisconsin.txt
.code camps
The Commit Graph
philly.txt

19. “saved code camps”
The Commit Graph
“second commit”
favorite_codecamp.txt
philly.txt wisconsin.txt
miami.txt
favorite_c
odecamp.
txt

20. Directed Acyclic Graph
A graph where points connect in one
direction. There is no way to loop back to
a point again.

21. Git “Verbs”

22. git init
•Lays git filesystem out in the current
directory under .git subfolder
•This is often hidden

23. git add
• -n or –dry-run
• -I –interactive

24. git commit

25. git branch

26. So what are branches anyway?
•Branches are sticky labels
•They get moved around for you when you
commit or do other actions.
•Branches are REALLY basic

27. git checkout

28. What would it mean to rename a branch?

29. git merge

30. git tag
•Tags are just like branches
•They are sticky labels
•BUT they represent a moment in time
•They do not get moved around for you

31. AnnotatedTags vs Lightweight
•AnnotatedTags have metadata, including the
“tagger”
•Lightweight tags now more clearly defined as
“temporary, private object labels”

32. git rebase

33. Rewriting History

34. git clone

35. GitTools

36. Getting Away From Command Line
#SoManyTools
• GitHub Desktop
• GitKraken
• SourceTree
• Tower
• SmartGit

37. Default Editor
• Visual Studio Code: bit.ly/vscode_git

38. GitHub

39. Using Git atWork

40. A Central Server
•Some repo will be considered “main”
•Various methods of allowing access
•Read Only, PR Everything
•Team read/write
•Many Possibilities

41. A Central Server
•Good step towards a CI process
•Build or deploy from a branch
•Build from any branch?
•Could choose to base versioning on tags

42. On Site Repo
•Products you install and maintain
•Gitlab
•Bitbucket Enterprise
•Github Enterprise
•Visual StudioTFS (using git repos)

43. In the cloud
•GitHub
•Gitlab
•Bitbucket
•Visual StudioTeam Services
•… and more

44. Work strategy
•Commit to master
•Commit and merge feature branches
•Feature branch and Pull Request
•Fork and Pull Request
•… and more

45. Branching Strategies
•Infamous “Successful branching strategy” post
•http://nvie.com/posts/a-successful-git-branching-
model/
•http://drewfradette.ca/a-simpler-successful-git-
branching-model/

46. Branching Strategies
•Trunk Based Development
•http://nvie.com/posts/a-successful-git-branching-
model/
•“developers collaborate on code in a single branch
called ‘trunk’, resist any pressure to create other long-
lived development branches”

47. Commit Strategy
•History is sacred, commit as it lays
•Shape history independently and present to team
•Every commit is release ready code

48. Visual StudioTeam
Services