Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Git for the Uninitiated

Avatar for Matthew McCullough Matthew McCullough
February 18, 2013
Programming
1
370

Git for the Uninitiated

A presentation delivered by Matthew McCullough at DevNexus 2013 in Atlanta, GA, USA.

Avatar for Matthew McCullough

Matthew McCullough

February 18, 2013
Tweet

More Decks by Matthew McCullough

See All by Matthew McCullough
Patterns for Collaborative Software Development in a Social World at JavaOne 2015
Avatar for Matthew McCullough matthewmccullough
1
410
Collaborative Software Development in a Social World at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
2
180
Git and GitHub Platform Review
Avatar for Matthew McCullough matthewmccullough
1
550
Your First Pull Request
Avatar for Matthew McCullough matthewmccullough
0
330
Git and GitHub Workflows at the Utah JUG
Avatar for Matthew McCullough matthewmccullough
1
850
Agile-ish life at GitHub
Avatar for Matthew McCullough matthewmccullough
2
410
Git and GitHub Agile Workflows for HP
Avatar for Matthew McCullough matthewmccullough
0
330
Writing Tools on the GitHub Platform
Avatar for Matthew McCullough matthewmccullough
0
290
Git Feature Branches as an Art
Avatar for Matthew McCullough matthewmccullough
0
190

Other Decks in Programming

See All in Programming
AtCoder Conference 2025
Avatar for shindannin shindannin
0
1k
フルサイクルエンジニアリングをAI Agentで全自動化したい 〜構想と現在地〜
Avatar for Kaito Minatoya kamina_zzz
0
390
AIエージェントの設計で注意するべきポイント6選
Avatar for Har1101 har1101
7
3.3k
AI 駆動開発ライフサイクル(AI-DLC):ソフトウェアエンジニアリングの再構築 / AI-DLC Introduction
Avatar for kanamsasa kanamasa
11
5.9k
humanlayerのブログから学ぶ、良いCLAUDE.mdの書き方
Avatar for Yuto tsukamoto1783
0
160
KIKI_MBSD Cybersecurity Challenges 2025
Avatar for ikema ikema
0
1.2k
20260127_試行錯誤の結晶を1冊に。著者が解説 先輩データサイエンティストからの指南書 / author's_commentary_ds_instructions_guide
Avatar for nash_efp nash_efp
0
650
HTTPプロトコル正しく理解していますか？ 〜かわいい猫と共に学ぼう。ฅ^•ω•^ฅ ﾆｬ〜
Avatar for ♛Heitor Hirose hekuchan
2
660
Fragmented Architectures
Avatar for Denys Poltorak denyspoltorak
0
140
CSC307 Lecture 02
Avatar for Javier Gonzalez-Sanchez javiergs
PRO
1
770
OSSとなったswift-buildで Xcodeのビルドを差し替えられるため 自分でXcodeを直せる時代になっている ダイアモンド問題編
Avatar for yimajo yimajo
3
550
Automatic Grammar Agreementと Markdown Extended Attributes
について
Avatar for Kishikawa Katsumi kishikawakatsumi
0
170

Featured

See All Featured
Un-Boring Meetings
Avatar for Sebastian Deterding codingconduct
0
190
Prompt Engineering for Job Search
Avatar for Mfonobong Umondia mfonobong
0
150
SEOcharity - Dark patterns in SEO and UX: How to avoid them and build a more ethical web
Avatar for Sara Fernández Carmona sarafernandez
0
110
Data-driven link building: lessons from a $708K investment (BrightonSEO talk)
Avatar for Szymon szymonslowik
1
900
The Success of Rails: Ensuring Growth for the Next 100 Years
Avatar for Eileen M. Uchitelle eileencodes
47
7.9k
Paper Plane
Avatar for Katie Cordina Lindsey katiecoart
PRO
0
46k
Leveraging Curiosity to Care for An Aging Population
Avatar for Cassini Nazir cassininazir
1
150
Digital Ethics as a Driver of Design Innovation
Avatar for Per Axbom axbom
PRO
1
160
StorybookのUI Testing Handbookを読んだ
Avatar for Shingo Yamazaki zakiyama
31
6.5k
The Cost Of JavaScript in 2023
Avatar for Addy Osmani addyosmani
55
9.4k
Learning to Love Humans: Emotional Interface Design
Avatar for Aarron Walter aarron
275
41k
Between Models and Reality
Avatar for mayunak mayunak
1
170

Transcript

  1. A collaborative reboot for version control GIT FOR THE UNINITIATED

  2. Matthew.... @matthewmccull ‣Open source contributor ‣O'Reilly Git Video Co-instructor ‣Co-Author

    of O'Reilly's Git book ‣5-year Git trainer ‣Instructor at GitHub

  3. http://oreil.ly/ogitvid

  4. http://amzn.to/oreillygit

  5. None
  6. None
  7. None
  8. None

  9. Version Control A refreshed approach to VCS

  10. None

  11. Open Source

  12. bash scripts ☛ C code

  13. is not a slightly better

  14. None
  15. None
  16. None

  17. http://git-scm.com

  18. Starting Up Creating a repository

  19. Get a GitHub account.

  20. Get a GitHub account. http://github.com/signup/free

  21. Create a new repo(sitory).

  22. Add a file.

  23. View the commit history (timeline).

  24. Make changes to the file.

  25. Repo Creation Local and remote initialization simplicity

  26. # Green field project $ git init newproject $ cd

    newproject # ...start coding

  27. or if you already have source code

  28. # Legacy project tree $ cd existingproject $ git init

    # Add all the code $ git add . $ git commit -m”Initial import”

  29. ‣Blob ‣Tree ‣Commit ‣Tag

  30. tree tree: 7e8b1 web blob: 9ab16 index.html a10b3 tree blob:

    8d162 logo.jpg blob: 51d22 draw.js 7e8b1 commit tree: a10b3 parent: nil author: Fird committer: Matthew message: Major refactoring of the web content. c67db blob <html> <body></body> </html> 9ab16 blob //Some more javascript var renderSize 51d22 blob 7D 8D B3 7F BD 12 9F E9 7B 78 9D 3F 5C A6 72 CB 8d162

  31. Collaborating Two authors

  32. Make simultaneous changes to the file.

  33. Collaborating Redux Untrusted collaborators

  34. Untrusted changes to the file.

  35. Changelist Three stage thinking

  36. Working Staging Repo add commit edit

  37. None

  38. ‣shopping cart ‣put things in ‣take things out ‣purchase at

    register

  39. v1 v2 v3 v4 File A File B File C

    File A File B File B File C v5 File A File B File B File A File A File C File C File C

  40. Workspaces The power of simple branch toggling

  41. Local Remote Upstream

  42. # Creating a branch git branch <BRANCHNAME>

  43. RELEASE_1.0 HEAD bug979branch commit c67db commit 9bd21 commit 1c2d7 commit

    8c2d1 commit 1bdcd commit 2daa1

  44. What do cheap branches enable?

  45. ‣Experimentation ‣

  46. ‣Experimentation ‣Safe experimentation

  47. Better reuse of units of work

  48. Work Models Enabling different development styles

  49. product v1.0 integration story1 story2 v1.5 integration story3

  50. Local Remote Upstream Integ Product Integ Product Integ Product

  51. Local Remote Upstream Idea Story Feature Feature Feature Integ Product

    Integ Product Integ Product

  52. Local Remote Upstream Idea Story Feature Feature Feature Integ Product

    Integ Product Integ Product

  53. Central Repo C e n t r a l i

    z e d

  54. Blessed Repo D i c t a t o r

    s h i p

  55. Certified Repo Development Repo n t e g r a

    t i o n M a n a g e d Continuous Integration Server

  56. C u s t o m + P u b

    l i c C o n t r i b Customized ☚ Private Public ☛ GitHub

  57. Mirror Development Repo M i r r o r e

    d Mirror Certified Repo

  58. Client Apps GUIs and other front-ends

  59. http://windows.github.com

  60. http://windows.github.com

  61. http://mac.github.com

  62. http://mac.github.com

  63. Remotes Bandwidth and geographic challenges

  64. Local Remote Upstream

  65. Local Remote Upstream

  66. Local Remote Upstream

  67. data from http://whygitisbetterthanx.com/#git-is-fast git svn Init git svn Status git

    svn Diff git svn Tag git svn Log git svn Commit (Lg) git svn Commit (Sm) git c svn c Branch Speed

  68. Local Remote Upstream commit fetch push clone clone clone push

    pull pull pull

  69. Commit Push Pull

  70. Commit Push Pull

  71. Commit Push Pull

  72. Integration CI, scripting, and hooks

  73. None

  74. "This is so important, we can't entrust it to automation.

    We need our top developer to supervise it."

  75. continuous integration servers jenkins travis ci circleci buildhive

  76. None
  77. None
  78. None
  79. None
  80. None

  81. Summary The Git and GitHub ecosystem

  82. [email protected] github.com/training @githubtraining githubtraining Q&A

  83. http://learn.github.com

  84. http://teach.github.com

  85. Why Git?

  86. None
  87. None

  88. I'm an egotistical bastard, and I name all my projects

    after myself. First Linux, now git. -Linus Torvalds “ Credits: Martin Streicher, http://en.wikipedia.org/wiki/File:Linus_Torvalds.jpeg

  89. CVS Subversion PVCS Perforce Clear Case Source Safe RCS Folders

  90. Small Footprint

  91. Simple

  92. Powerful

  93. Composable

  94. Setting Up Git

  95. binaries on your $PATH

  96. http://help.github.com

  97. None

  98. Using Git

  99. Create a Git repository

  100. None

  101. http://git-scm.com/book

  102. http://teach.github.com

  103. http://help.github.com

  104. Git GUIs

  105. None

  106. https://github.com/github/GitPad

  107. None

  108. http://eclipse.org/egit/

  109. None

  110. Using GitHub

  111. None

  112. ‣Social coding ‣Fork and pull model

  113. Blessed Repo

  114. None

  115. ‣Web-based image diff ‣Lightweight issue tracking

  116. None
  117. None

  118. https://enterprise.github.com

  119. None

  120. Q&A

  121. @matthewmccull [email protected] training.github.com