The Nits and Grits of Git
1 like255 views
This document provides an overview of Git, detailing its history, fundamental data structures, and essential commands. It discusses concepts such as objects, trees, commits, and merging, while assuming familiarity with basic Git workflows. The presentation includes demos and resources for further learning about Git's functionalities.
The Nits and Grits of Git
- 1. The Nits and Grits of Git How Git really works Ryan Michela - Salesforce
- 2. Agenda 1. Git history 2. Objects, Trees and Commits 3. Refs and Branches 4. Merging Assumption: You are already familiar with normal Git workflow
- 3. A brief history of Git Launched in 2005 Built by the Linux kernel team Started by Linus Torvalds 2014 - More Git than SVN 2016 - 38+ Million Github repos
- 4. The most common commands git add git status git commit git branch git merge
- 5. Git objects Content addressable filesystem Every object known by a SHA1 hash All objects stored in the .git directory Demo...
- 6. Tree objects Connect objects to the filesystem Tree = directory Object = file content Git index State of the repo right now Demo...
- 7. Commands so far git add git hash-object -w git update-index git write-tree git status git cat-file git ls-files -s
- 8. Commit objects Snapshots of trees Explains who/when/why History of code Demo...
- 9. References Named pointers to commit SHA1 - Branches .git/refs/heads/master HEAD Demo...
- 10. Commands so far git add git hash-object -w git update-index git write-tree git status git cat-file git ls-files -s git commit git commit-tree git update-ref
- 11. Merging Joins branches back together A commit with one or more parents Merges parent trees together into one Demo...
- 12. Commands so far git add git hash-object -w git update-index git write-tree git status git cat-file git ls-files -s git commit git commit-tree git update-ref git merge git symbolic-ref git commit-tree -p
- 13. The heart of Git Content addressable filesystem Three principal data structures Object Tree Commit Heaps of magic
- 14. Questions?
- 15. Resources Commands used in this presentation Pro Git book All Git commands
- 16. Legal Stuff All presentation content is licensed under the Creative Commons Attribution Noncommercial Share Alike 3.0 (CC BY-NC-SA 3.0) license Some images used from Pro Git Second Edition by Scott Chacon and Ben Straub licensed under CC BY-NC-SA 3.0 Git logo licensed under Creative Commons Attribution 3.0 (CC BY 3.0) Wizard hat image under public domain from Wikipedia