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

Git Good with Git! — Intermediate

Avatar for erynofwales erynofwales
August 06, 2012
Technology
1
230

Git Good with Git! — Intermediate

Intermediate Git workshop.

Avatar for erynofwales

erynofwales

August 06, 2012
Tweet

Other Decks in Technology

See All in Technology
30万人の同時アクセスに耐えたい！新サービスの盤石なリリースを支える負荷試験 / SRE Kaigi 2026
Avatar for GENDA genda
3
1.1k
MCPでつなぐElasticsearchとLLM - 深夜の障害対応を楽にしたい / Bridging Elasticsearch and LLMs with MCP
Avatar for Sashimimochi sashimimochi
0
150
AIエージェントを開発しよう！-AgentCore活用の勘所-
Avatar for YukiOgawa yukiogawa
0
100
usermode linux without MMU - fosdem2026 kernel devroom
Avatar for Hajime Tazaki thehajime
0
230
Oracle Cloud Observability and Management Platform - OCI 運用監視サービス概要 -
Avatar for oracle4engineer oracle4engineer
PRO
2
14k
なぜ今、コスト最適化（倹約）が必要なのか？ ～AWSでのコスト最適化の進め方「目的編」～
Avatar for Hayato Tan htan
1
110
広告の効果検証を題材にした因果推論の精度検証について
Avatar for ZOZO Developers zozotech
PRO
0
150
AI駆動PjMの理想像 と現在地 -実践例を添えて-
Avatar for オカムラ masahiro_okamura
1
110
M&A 後の統合をどう進めるか ─ ナレッジワーク × Poetics が実践した組織とシステムの融合
Avatar for KNOWLEDGE WORK / 株式会社ナレッジワーク kworkdev
PRO
1
420
データ民主化のための LLM 活用状況と課題紹介（IVRy の場合）
Avatar for 和田 悠佑 wxyzzz
2
690
Tebiki Engineering Team Deck
Avatar for Tebiki, Inc. tebiki
0
24k
プロダクト成長を支える開発基盤とスケールに伴う課題
Avatar for yuu26 yuu26
4
1.3k

Featured

See All Featured
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
Avatar for Dan Newman danielanewman
231
22k
Visualization
Avatar for Eitan Lees eitanlees
150
17k
HU Berlin: Industrial-Strength Natural Language Processing with spaCy and Prodigy
Avatar for Ines Montani inesmontani
PRO
0
200
Designing for humans not robots
Avatar for Tammie Lister tammielis
254
26k
Tell your own story through comics
Avatar for letsgokoyo letsgokoyo
1
810
Noah Learner - AI + Me: how we built a GSC Bulk Export data pipeline
Avatar for Tech SEO Connect techseoconnect
PRO
0
100
The Art of Delivering Value - GDevCon NA Keynote
Avatar for David Neal reverentgeek
16
1.8k
Avoiding the “Bad Training, Faster” Trap in the Age of AI
Avatar for Mike Taylor tmiket
0
72
世界の人気アプリ100個を分析して見えたペイウォール設計の心得
Avatar for Akihiro Kokubo akihiro_kokubo
PRO
66
36k
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
Avatar for Kevin Liebholz kevinliebholz
37
6.3k
Rails Girls Zürich Keynote
Avatar for Gregor Martynus gr2m
96
14k
Leo the Paperboy
Avatar for Maya Tellez mayatellez
4
1.4k

Transcript

  1. Git Good with Git! – Intermediate Eryn Wells (@erynofwales) 1

    Tuesday, 2012 August 7

  2. Do you have Git installed? http://git-scm.com 2 Tuesday, 2012 August

    7

  3. Clone this repo git clone https://github.com/erynofwales/talks- intermediate-git-demo.git 3 Tuesday, 2012

    August 7

  4. Ask questions! @erynofwales [email protected] 4 Tuesday, 2012 August 7

  5. Review 5 Tuesday, 2012 August 7

  6. What is Git? 6 Tuesday, 2012 August 7

  7. Distributed Content Tracking 7 Tuesday, 2012 August 7

  8. Distributed Content Tracking 8 Tuesday, 2012 August 7

  9. You 9 Tuesday, 2012 August 7

  10. You 9 Tuesday, 2012 August 7

  11. Distributed Content Tracking 10 Tuesday, 2012 August 7

  12. Anatomy of a Git Repo 11 Tuesday, 2012 August 7

  13. 1. Working Tree 12 Tuesday, 2012 August 7

  14. 2. Stage (a.k.a. the index) 13 Tuesday, 2012 August 7

  15. 3. Repository 14 Tuesday, 2012 August 7

  16. Three-Stage Workflow 15 Tuesday, 2012 August 7

  17. 1. Make some changes vim emacs TextMate git rm git

    mv 16 Tuesday, 2012 August 7

  18. 2. Stage your changes git diff git diff --cached git

    add 17 Tuesday, 2012 August 7

  19. 3. Commit your changes git commit 18 Tuesday, 2012 August

    7

  20. Getting Status git diff git status 19 Tuesday, 2012 August

    7

  21. Git <3 Graphs 20 Tuesday, 2012 August 7

  22. JavaScript Ruby Python Shell Java PHP C C++ Perl Objective-C

    0% 5% 10% 15% 20% 3% 4% 4% 7% 7% 8% 8% 9% 14% 20% Top Languages (C) 2012 GITHUB, FETCHED 2012-08-04 21 Tuesday, 2012 August 7

  23. JavaScript Ruby Python Shell Java PHP C C++ Perl Objective-C

    0% 5% 10% 15% 20% 3% 4% 4% 7% 7% 8% 8% 9% 14% 20% Top Languages (C) 2012 GITHUB, FETCHED 2012-08-04 21 Tuesday, 2012 August 7

  24. Directed Acyclic Graphs 22 Tuesday, 2012 August 7

  25. Directed Acyclic Graphs 23 Tuesday, 2012 August 7

  26. A B C E D F G 24 Tuesday, 2012

    August 7

  27. Directed Acyclic Graphs 25 Tuesday, 2012 August 7

  28. A B C E D F G 26 Tuesday, 2012

    August 7

  29. Directed Acyclic Graphs 27 Tuesday, 2012 August 7

  30. A B C E D F 28 Tuesday, 2012 August

    7

  31. A B C E D F 29 Tuesday, 2012 August

    7

  32. Peeking Under the Hood 30 Tuesday, 2012 August 7

  33. A B C E D F master foo HEAD 31

    Tuesday, 2012 August 7

  34. Hash ALL the things f4b0043b2bc107524d09b1640f9f32c809005474 cd88047e5d30663d7c158a1e6b0d5b2161faad32 32 Tuesday, 2012 August

    7

  35. 772be54 1b2b4c0 a7b938f 662009f 35ab7c0 3821f34 master foo HEAD 33

    Tuesday, 2012 August 7

  36. Branches and tags 34 Tuesday, 2012 August 7

  37. A B C E D F master foo HEAD 35

    Tuesday, 2012 August 7

  38. HEAD 36 Tuesday, 2012 August 7

  39. Fun with Graphs 37 Tuesday, 2012 August 7

  40. A B C E D F master foo HEAD 38

    Tuesday, 2012 August 7

  41. git commit 39 Tuesday, 2012 August 7

  42. git commit A B C E D F master foo

    HEAD A B C E D F master foo HEAD 40 Tuesday, 2012 August 7

  43. git commit git commit -m ‘blah blah blah’ A B

    C E D F master foo HEAD A B C E D F master foo HEAD 40 Tuesday, 2012 August 7

  44. git commit git commit -m ‘blah blah blah’ A B

    C E D F G master foo HEAD A B C E D F G master foo HEAD 40 Tuesday, 2012 August 7

  45. git commit git commit -m ‘blah blah blah’ A B

    C E D F G master foo HEAD A B C E D F G master foo HEAD 40 Tuesday, 2012 August 7

  46. git reset 41 Tuesday, 2012 August 7

  47. git reset A B C E D F G master

    foo HEAD A B C E D F G master foo HEAD 42 Tuesday, 2012 August 7

  48. git reset git reset F A B C E D

    F G master foo HEAD A B C E D F G master foo HEAD 42 Tuesday, 2012 August 7

  49. git reset git reset F A B C E D

    F G master foo HEAD A B C E D F G master foo HEAD 42 Tuesday, 2012 August 7

  50. git checkout 43 Tuesday, 2012 August 7

  51. git checkout A B C E D F G master

    foo HEAD A B C E D F G master foo HEAD 44 Tuesday, 2012 August 7

  52. git checkout git checkout master A B C E D

    F G master foo HEAD A B C E D F G master foo HEAD 44 Tuesday, 2012 August 7

  53. git checkout git checkout master A B C E D

    F G master foo HEAD A B C E D F G master foo HEAD 44 Tuesday, 2012 August 7

  54. git checkout A B C E D F G master

    foo HEAD A B C E D F G master foo HEAD 45 Tuesday, 2012 August 7

  55. git checkout git checkout F A B C E D

    F G master foo HEAD A B C E D F G master foo HEAD 45 Tuesday, 2012 August 7

  56. git checkout git checkout F A B C E D

    F G master foo HEAD A B C E D F G master foo HEAD 45 Tuesday, 2012 August 7

  57. git checkout git checkout F A B C E D

    F G master foo HEAD A B C E D F G master foo HEAD DETACHED HEAD 45 Tuesday, 2012 August 7

  58. git branch 46 Tuesday, 2012 August 7

  59. git branch A B C E D F G master

    foo HEAD 47 Tuesday, 2012 August 7

  60. git branch A B C E D F G master

    foo HEAD git branch bar 47 Tuesday, 2012 August 7

  61. git branch A B C E D F G master

    foo bar HEAD 48 Tuesday, 2012 August 7

  62. git merge 49 Tuesday, 2012 August 7

  63. git merge A B C E D F G master

    foo HEAD 50 Tuesday, 2012 August 7

  64. git merge A B C E D F G master

    foo HEAD git merge foo 50 Tuesday, 2012 August 7

  65. git merge A B C E D H F G

    master foo HEAD 51 Tuesday, 2012 August 7

  66. git merge A B C E D H F G

    master foo HEAD 52 Tuesday, 2012 August 7

  67. git rebase 53 Tuesday, 2012 August 7

  68. git rebase A B C E D F G master

    foo HEAD 54 Tuesday, 2012 August 7

  69. git rebase A B C E D F G master

    foo HEAD git rebase master 54 Tuesday, 2012 August 7

  70. git rebase A B C D E' F' G' master

    foo HEAD 55 Tuesday, 2012 August 7

  71. Remotes 56 Tuesday, 2012 August 7

  72. What are remotes? 57 Tuesday, 2012 August 7

  73. What are remotes? Any repository that’s not your current one!

    57 Tuesday, 2012 August 7

  74. Another directory on your machine /some/repo/path Another server https://github.com/erynofwales/shortcake.git ssh://[email protected]:erynofwales/shortcake.git

    git://github.com/erynofwales/shortcake.git 58 Tuesday, 2012 August 7

  75. Remote branches origin/master 59 Tuesday, 2012 August 7

  76. How do you make remotes? 60 Tuesday, 2012 August 7

  77. How do you make remotes? With git remote! 60 Tuesday,

    2012 August 7

  78. git remote and git remote -v git remote add git

    remote rm 61 Tuesday, 2012 August 7

  79. git clone 62 Tuesday, 2012 August 7

  80. A B C E D F master foo HEAD GITHUB

    63 Tuesday, 2012 August 7

  81. A B C E D F master foo HEAD GITHUB

    A B C E D F master foo HEAD LOCAL 63 Tuesday, 2012 August 7

  82. git fetch 64 Tuesday, 2012 August 7

  83. git fetch A B C E D F G master

    foo HEAD 65 Tuesday, 2012 August 7

  84. git fetch A B C E D F G master

    foo HEAD git fetch origin foo 65 Tuesday, 2012 August 7

  85. git fetch A B C E D F G H

    master foo origin/foo HEAD FETCH_HEAD 66 Tuesday, 2012 August 7

  86. git fetch A B C E D F G H

    master foo origin/foo HEAD FETCH_HEAD git merge origin/foo 66 Tuesday, 2012 August 7

  87. git fetch A B C E D F G H

    master foo origin/foo HEAD 67 Tuesday, 2012 August 7

  88. git pull 68 Tuesday, 2012 August 7

  89. git pull A B C E D F G master

    foo HEAD 69 Tuesday, 2012 August 7

  90. git pull A B C E D F G master

    foo HEAD git pull origin foo 69 Tuesday, 2012 August 7

  91. git pull A B C E D F G H

    master foo origin/foo HEAD 70 Tuesday, 2012 August 7

  92. git push 71 Tuesday, 2012 August 7

  93. git pull A B C E D F G H

    master foo origin/foo HEAD 72 Tuesday, 2012 August 7

  94. git pull git push origin foo A B C E

    D F G H master foo origin/foo HEAD 72 Tuesday, 2012 August 7

  95. git pull A B C E D F G H

    master foo origin/foo HEAD 73 Tuesday, 2012 August 7

  96. GitHub 74 Tuesday, 2012 August 7

  97. SSH Keys 75 Tuesday, 2012 August 7

  98. Creating Repositories 76 Tuesday, 2012 August 7

  99. Forking 77 Tuesday, 2012 August 7

  100. Pull Requests 78 Tuesday, 2012 August 7

  101. Tweaking Git 79 Tuesday, 2012 August 7

  102. git config and .gitconfig 80 Tuesday, 2012 August 7

  103. [user] ! name = Eryn Wells ! email = [email protected]

    [core] editor = vim quotepath = false [color] ui = auto [merge] tool = vimdiff [alias] st = status co = checkout ci = commit br = branch lg = log --graph --pretty=format:'%Cred%h%Creset - %C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative push = push -u [ui] ! color = true [mergetool] ! keepBackup = true 81 Tuesday, 2012 August 7

  104. Personal stuff git config user.name “Your Name” git config user.email

    “[email protected]” 82 Tuesday, 2012 August 7

  105. Aliases git config --set alias.[name] “big long command” 83 Tuesday,

    2012 August 7

  106. Aliases git config alias.st status git config alias.br branch 83

    Tuesday, 2012 August 7

  107. Aliases git config alias.co checkout git config alias.ci commit 83

    Tuesday, 2012 August 7

  108. Aliases git config alias.lg “log --graph --pretty=format:'%Cred%h %Creset -%C(yellow)%d%Creset %s

    %Cgreen(%cr) %C(bold blue)< %an>%Creset' --abbrev-commit --date=relative” 83 Tuesday, 2012 August 7

  109. .gitignore 84 Tuesday, 2012 August 7

  110. *.log *.pot *.pyc local_settings.py 85 Tuesday, 2012 August 7

  111. # Xcode build/* *.pbxuser !default.pbxuser *.mode1v3 !default.mode1v3 *.mode2v3 !default.mode2v3 *.perspectivev3

    !default.perspectivev3 *.xcworkspace !default.xcworkspace xcuserdata profile *.moved-aside 86 Tuesday, 2012 August 7

  112. Questions? 87 Tuesday, 2012 August 7