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

Mastering Git and GitHub (ConFoo 2014)

Ben Straub
February 28, 2014
Programming
5
360

Mastering Git and GitHub (ConFoo 2014)

Git and GitHub are great tools for making software. Are you making the best use of them? Are you still doing work that robots can do for you?

Are you scared of rebase and filter-branch? Do Emoji and mentions vex you? Are you looking to move your team to the next level?

This talk is for you. Learn how to let Git and GitHub help you make better software.

Ben Straub

February 28, 2014
Tweet

More Decks by Ben Straub

See All by Ben Straub
Hacking Culture with Javascript (CodeMotion Amsterdam 2017)
benstraub
0
400
Hacking Culture with Javascript - CascadiaFest 2015
benstraub
0
480
Hacking Culture with Chat Robots
benstraub
0
810
Switching to Git – Why and How (ConFoo 2014)
benstraub
1
100
AppsWorld Europe 2013 - Git & GitHub for Ninjas
benstraub
1
140
Web & PHP Con: Git for Ninjas
benstraub
0
250
ConFoo - Git for Ninjas
benstraub
1
560
Introduction to Git
benstraub
2
790
OpenBlend - Git (and GitHub) for Padawan
benstraub
0
690

Other Decks in Programming

See All in Programming
Mermaid x AST x 生成AI = コードとドキュメントの完全同期への道
shibuyamizuho
0
160
テストコードのガイドライン 〜作成から運用まで〜
riku929hr
1
130
KubeCon + CloudNativeCon NA 2024 Overview at Kubernetes Meetup Tokyo #68 / amsy810_k8sjp68
masayaaoyama
0
250
テストコード文化を0から作り、変化し続けた組織
kazatohiei
2
1.5k
Effective Signals in Angular 19+: Rules and Helpers @ngbe2024
manfredsteyer
PRO
0
130
バグを見つけた？それAppleに直してもらおう！
uetyo
0
180
テストケースの名前はどうつけるべきか？
orgachem
PRO
0
130
The Efficiency Paradox and How to Save Yourself and the World
hollycummins
1
440
今からはじめるAndroidアプリ開発 2024 / DevFest 2024
star_zero
0
1k
SymfonyCon Vienna 2025: Twig, still relevant in 2025?
fabpot
3
1.2k
range over funcの使い道と非同期N+1リゾルバーの夢 / about a range over func
mackee
0
110
tidymodelsによるtidyな生存時間解析 / Japan.R2024
dropout009
1
770

Featured

See All Featured
The Web Performance Landscape in 2024 [PerfNow 2024]
tammyeverts
2
290
The Straight Up "How To Draw Better" Workshop
denniskardys
232
140k
Making the Leap to Tech Lead
cromwellryan
133
9k
Principles of Awesome APIs and How to Build Them.
keavy
126
17k
Code Review Best Practice
trishagee
65
17k
4 Signs Your Business is Dying
shpigford
181
21k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
33
1.9k
Automating Front-end Workflow
addyosmani
1366
200k
How To Stay Up To Date on Web Technology
chriscoyier
789
250k
The Invisible Side of Design
smashingmag
298
50k
Making Projects Easy
brettharned
116
5.9k
Imperfection Machines: The Place of Print at Facebook
scottboms
266
13k

Transcript

  1. ! Mastering Git & GitHub

  2. ! ben " benstraub Ben Straub

  3. None
  4. None

  5. ! What to Expect

  6. ! What to Expect not

  7. ! Git & GitHub for Ninjas

  8. Git & GitHub for Ninjas

  9. Shell

  10. ! bash

  11. ! zsh

  12. ! powershell

  13. Aliases $ git config --global alias.lg log --graph \ --pretty=oneline

    --abbrev-commit --decorate

  14. !/matthewmccullough/dotfiles/blob/master/gitconfig

  15. Git Is Simple

  16. Objects and Refs

  17. Objects Are Easy

  18. $ git cat-file -t d7abd6 blob $ git cat-file -p

    d7abd6 <!DOCTYPE html> <!--[if IEMobile 7 ]><html class="no-js iem7"><![endif]--> <!--[if lt IE 9]><html class="no-js lte-ie8"><![endif]--> <!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html lang="en"><!--<![endif]--> <head> <meta charset="utf-8"> <title>{% if page.title %}{{ page.title }} - {% endif %}{{ si Blob

  19. $ git cat-file -t d7abd6 blob $ git cat-file -p

    d7abd6 <!DOCTYPE html> <!--[if IEMobile 7 ]><html class="no-js iem7"><![endif]--> <!--[if lt IE 9]><html class="no-js lte-ie8"><![endif]--> <!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html lang="en"><!--<![endif]--> <head> <meta charset="utf-8"> <title>{% if page.title %}{{ page.title }} - {% endif %}{{ si Blob

  20. $ git cat-file -t d7abd6 blob $ git cat-file -p

    d7abd6 <!DOCTYPE html> <!--[if IEMobile 7 ]><html class="no-js iem7"><![endif]--> <!--[if lt IE 9]><html class="no-js lte-ie8"><![endif]--> <!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html lang="en"><!--<![endif]--> <head> <meta charset="utf-8"> <title>{% if page.title %}{{ page.title }} - {% endif %}{{ si Blob

  21. $ git cat-file -t d7abd6 blob $ git cat-file -p

    d7abd6 <!DOCTYPE html> <!--[if IEMobile 7 ]><html class="no-js iem7"><![endif]--> <!--[if lt IE 9]><html class="no-js lte-ie8"><![endif]--> <!--[if (gt IE 8)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html lang="en"><!--<![endif]--> <head> <meta charset="utf-8"> <title>{% if page.title %}{{ page.title }} - {% endif %}{{ si Blob

  22. $ git cat-file -t 8f5b65 tree $ git cat-file -p

    8f5b65 100644 blob 08b8e3400a81a79aeb42878171449b773ab493c0 after_foot 100644 blob 11517b315de6d7bc7550cc74ae413f1e6dafce19 archive_po 100644 blob 8ad5afd4581caa7458658325aeec9f8de875b988 article.ht 040000 tree 5c2166adaa57c909182a45b995dfb750c22c8810 asides 040000 tree 52deb7c58d46aa09208c0b863fbecee81a2e3dad custom 100644 blob eb308779fa09eadd8575b1acea2801f16ef1d839 disqus.htm 100644 blob 74f91307278c092bca1e862337cb8d2b1ac14d94 facebook_l 100644 blob 3a8c7687474e513b196b50f5634c6decd14ed484 footer.htm Tree

  23. Commit $ git cat-file -t e365b187 commit $ git cat-file

    -p e365b187 tree 58c796e7717809c2ca2217fc5424fdebdbc121b1 parent d4291dfddfae86cfacec789133861098cebc67d4 author Ben Straub <[email protected]> 1380719530 -0700 committer Ben Straub <[email protected]> 1380719530 -0700 ! Fix typo, remove false statement

  24. Tag Annotation $ git cat-file -t 849a5e34a tag $ git

    cat-file -p 849a5e34a object a65fedf39aefe402d3bb6e24df4d4f5fe4547750 type commit tag hard_tag tagger Ben Straub <[email protected]> Fri May 11 11:47:58 2012 ! Tag on tag

  25. Refs are Easy

  26. * * | * | | * | | *

    | | * | | |\ | |/ / |/| | | | | * | | | * | | | * | | |/ | |/| | * | | |\ \ | |/ / |/| / | |/ * | | * | * |/ * * Refs are Easy

  27. * * | * | | * | | *

    | | * | | |\ | |/ / |/| | | | | * | | | * | | | * | | |/ | |/| | * | | |\ \ | |/ / |/| / | |/ * | | * | * |/ * * Refs are Easy

  28. $ cat refs/heads/master 2b67270f960563c55dd6c66495517bccc4f7fb17 Branches

  29. $ cat refs/tags/v0.19.0 eddc1f1ed78898a4ca41480045b1d0d5b075e773 Tags

  30. $ cat HEAD ref: refs/heads/master Symbolic Refs

  31. Symbolic Refs • branch -> commit • HEAD -> branch

    -> commit • tag -> commit • tag -> annotation -> commit • tag -> blob • HEAD -> branch -> tag -> annotation1 -> annotation2 -> blob • WAT

  32. Git Is Simple?

  33. None

  34. Three Trees

  35. HEAD Last Commit Next Parent

  36. Index Proposed Next Commit

  37. Working Directory Sandbox

  38. Moving Things Around • Sandbox -> Index: git add •

    Index -> History: git commit • History -> Index/Sandbox: git checkout

  39. git reset is Weird

  40. Reset 1. Move HEAD
 (Stop here if --soft) 2. Make

    the index look like HEAD
 (Stop here if --mixed, which is the default) 3.Make the sandbox look like the index
 (Stop here if --hard)

  41. Bisect

  42. $ ./new_test.sh BAD THINGS $ git lga * 394fe77 (HEAD,

    master) MOAR DOTS * 155cfdc Great justice! * 2e36522 Some innocent change * bf4a9fd Fixed configuration * 713d64c Fixed bug #718 * f4fb4ef Work on feature #72 * 2b241ed Initial commit $ git bisect start $ git bisect good 2b241 $ git bisect bad Bisecting: 2 revisions left to test after this (roughly 2 step

  43. $ ./new_test.sh BAD THINGS $ git lga * 394fe77 (HEAD,

    master) MOAR DOTS * 155cfdc Great justice! * 2e36522 Some innocent change * bf4a9fd Fixed configuration * 713d64c Fixed bug #718 * f4fb4ef Work on feature #72 * 2b241ed Initial commit $ git bisect start $ git bisect good 2b241 $ git bisect bad Bisecting: 2 revisions left to test after this (roughly 2 step

  44. $ ./new_test.sh BAD THINGS $ git lga * 394fe77 (HEAD,

    master) MOAR DOTS * 155cfdc Great justice! * 2e36522 Some innocent change * bf4a9fd Fixed configuration * 713d64c Fixed bug #718 * f4fb4ef Work on feature #72 * 2b241ed Initial commit $ git bisect start $ git bisect good 2b241 $ git bisect bad Bisecting: 2 revisions left to test after this (roughly 2 step

  45. $ git lga * 394fe77 (HEAD, master) MOAR DOTS *

    155cfdc Great justice! * 2e36522 Some innocent change * bf4a9fd Fixed configuration * 713d64c Fixed bug #718 * f4fb4ef Work on feature #72 * 2b241ed Initial commit $ git bisect start $ git bisect good 2b241 $ git bisect bad Bisecting: 2 revisions left to test after this (roughly 2 step [bf4a9fdc7ca066fd132f79e8607d7fda81bc9ac7] Fixed configuration $ git lga * 394fe77 (master, refs/bisect/bad) MOAR DOTS * 155cfdc Great justice! * 2e36522 Some innocent change

  46. $ git bisect start $ git bisect good 2b241 $

    git bisect bad Bisecting: 2 revisions left to test after this (roughly 2 step [bf4a9fdc7ca066fd132f79e8607d7fda81bc9ac7] Fixed configuration $ git lga * 394fe77 (master, refs/bisect/bad) MOAR DOTS * 155cfdc Great justice! * 2e36522 Some innocent change * bf4a9fd (HEAD) Fixed configuration * 713d64c Fixed bug #718 * f4fb4ef Work on feature #72 * 2b241ed (refs/bisect/good-2b241ed06235b4ccbdf7dabae47b5c9f58 $ ./new_test.sh ALL CLEAR $ git bisect good Bisecting: 0 revisions left to test after this (roughly 1 step

  47. $ git bisect bad Bisecting: 2 revisions left to test

    after this (roughly 2 step [bf4a9fdc7ca066fd132f79e8607d7fda81bc9ac7] Fixed configuration $ git lga * 394fe77 (master, refs/bisect/bad) MOAR DOTS * 155cfdc Great justice! * 2e36522 Some innocent change * bf4a9fd (HEAD) Fixed configuration * 713d64c Fixed bug #718 * f4fb4ef Work on feature #72 * 2b241ed (refs/bisect/good-2b241ed06235b4ccbdf7dabae47b5c9f58 $ ./new_test.sh ALL CLEAR $ git bisect good Bisecting: 0 revisions left to test after this (roughly 1 step [155cfdc11389c013609c75f5d3dd4e834f0c7f39] Great justice! $ git lga

  48. $ git lga * 394fe77 (master, refs/bisect/bad) MOAR DOTS *

    155cfdc Great justice! * 2e36522 Some innocent change * bf4a9fd (HEAD) Fixed configuration * 713d64c Fixed bug #718 * f4fb4ef Work on feature #72 * 2b241ed (refs/bisect/good-2b241ed06235b4ccbdf7dabae47b5c9f58 $ ./new_test.sh ALL CLEAR $ git bisect good Bisecting: 0 revisions left to test after this (roughly 1 step [155cfdc11389c013609c75f5d3dd4e834f0c7f39] Great justice! $ git lga * 394fe77 (master, refs/bisect/bad) MOAR DOTS * 155cfdc (HEAD) Great justice! * 2e36522 Some innocent change

  49. $ ./new_test.sh ALL CLEAR $ git bisect good Bisecting: 0

    revisions left to test after this (roughly 1 step [155cfdc11389c013609c75f5d3dd4e834f0c7f39] Great justice! $ git lga * 394fe77 (master, refs/bisect/bad) MOAR DOTS * 155cfdc (HEAD) Great justice! * 2e36522 Some innocent change * bf4a9fd (refs/bisect/good-bf4a9fdc7ca066fd132f79e8607d7fda81 * 713d64c Fixed bug #718 * f4fb4ef Work on feature #72 * 2b241ed (refs/bisect/good-2b241ed06235b4ccbdf7dabae47b5c9f58 $ ./new_test.sh BAD THINGS $ git bisect bad Bisecting: 0 revisions left to test after this (roughly 0 step

  50. $ git lga * 394fe77 (master, refs/bisect/bad) MOAR DOTS *

    155cfdc (HEAD) Great justice! * 2e36522 Some innocent change * bf4a9fd (refs/bisect/good-bf4a9fdc7ca066fd132f79e8607d7fda81 * 713d64c Fixed bug #718 * f4fb4ef Work on feature #72 * 2b241ed (refs/bisect/good-2b241ed06235b4ccbdf7dabae47b5c9f58 $ ./new_test.sh BAD THINGS $ git bisect bad Bisecting: 0 revisions left to test after this (roughly 0 step [2e3652251ca60b394dd6dd58b35aad2c68341b81] Some innocent chang $ ./new_test.sh BAD THINGS $ git bisect bad 2e3652251ca60b394dd6dd58b35aad2c68341b81 is the first bad comm

  51. Bisecting: 0 revisions left to test after this (roughly 0

    step [2e3652251ca60b394dd6dd58b35aad2c68341b81] Some innocent chang $ ./new_test.sh BAD THINGS $ git bisect bad 2e3652251ca60b394dd6dd58b35aad2c68341b81 is the first bad comm commit 2e3652251ca60b394dd6dd58b35aad2c68341b81 Author: Me <[email protected]> Date: Sat Sep 8 21:07:23 2012 -0700 ! Some innocent change ! :100644 100644 cffc75085d348cd4f418fc4d4257df03eb8c3c15 4d95ce $ git show commit 2e3652251ca60b394dd6dd58b35aad2c68341b81 Author: Me <[email protected]> Date: Sat Sep 8 21:07:23 2012 -0700

  52. Some innocent change ! diff --git a/critical.txt b/critical.txt index cffc750..4d95ced

    100644 --- a/critical.txt +++ b/critical.txt @@ -2,5 +2,6 @@ GOOD GOOD GOOD GOOD +EVIL MUAHAHAHAHA GOOD GOOD $ git lga * 394fe77 (master) MOAR DOTS * 155cfdc Great justice! * 2e36522 (HEAD, refs/bisect/bad) Some innocent change

  53. GOOD GOOD +EVIL MUAHAHAHAHA GOOD GOOD $ git lga *

    394fe77 (master) MOAR DOTS * 155cfdc Great justice! * 2e36522 (HEAD, refs/bisect/bad) Some innocent change * bf4a9fd (refs/bisect/good-bf4a9fdc7ca066fd132f79e8607d7fda81 * 713d64c Fixed bug #718 * f4fb4ef Work on feature #72 * 2b241ed (refs/bisect/good-2b241ed06235b4ccbdf7dabae47b5c9f58 $ git bisect reset Previous HEAD position was 2e36522... Some innocent change Switched to branch 'master' $ git lga

  54. GOOD GOOD $ git lga * 394fe77 (master) MOAR DOTS

    * 155cfdc Great justice! * 2e36522 (HEAD, refs/bisect/bad) Some innocent change * bf4a9fd (refs/bisect/good-bf4a9fdc7ca066fd132f79e8607d7fda81 * 713d64c Fixed bug #718 * f4fb4ef Work on feature #72 * 2b241ed (refs/bisect/good-2b241ed06235b4ccbdf7dabae47b5c9f58 $ git bisect reset Previous HEAD position was 2e36522... Some innocent change Switched to branch 'master' $ git lga * 394fe77 (HEAD, master) MOAR DOTS * 155cfdc Great justice! * 2e36522 Some innocent change

  55. * f4fb4ef Work on feature #72 * 2b241ed (refs/bisect/good-2b241ed06235b4ccbdf7dabae47b5c9f58 $

    git bisect reset Previous HEAD position was 2e36522... Some innocent change Switched to branch 'master' $ git lga * 394fe77 (HEAD, master) MOAR DOTS * 155cfdc Great justice! * 2e36522 Some innocent change * bf4a9fd Fixed configuration * 713d64c Fixed bug #718 * f4fb4ef Work on feature #72 * 2b241ed Initial commit

  56. $ ./new_test.sh BAD THINGS $ git bisect start $ git

    bisect good 2b241 $ git bisect bad Bisecting: 2 revisions left to test after this (roughly 2 step [bf4a9fdc7ca066fd132f79e8607d7fda81bc9ac7] Fixed configuration $ git bisect run ./new_test.sh running ./new_test.sh ALL CLEAR Bisecting: 0 revisions left to test after this (roughly 1 step [155cfdc11389c013609c75f5d3dd4e834f0c7f39] Great justice! running ./new_test.sh BAD THINGS

  57. $ ./new_test.sh BAD THINGS $ git bisect start $ git

    bisect good 2b241 $ git bisect bad Bisecting: 2 revisions left to test after this (roughly 2 step [bf4a9fdc7ca066fd132f79e8607d7fda81bc9ac7] Fixed configuration $ git bisect run ./new_test.sh running ./new_test.sh ALL CLEAR Bisecting: 0 revisions left to test after this (roughly 1 step [155cfdc11389c013609c75f5d3dd4e834f0c7f39] Great justice! running ./new_test.sh BAD THINGS

  58. $ ./new_test.sh BAD THINGS $ git bisect start $ git

    bisect good 2b241 $ git bisect bad Bisecting: 2 revisions left to test after this (roughly 2 step [bf4a9fdc7ca066fd132f79e8607d7fda81bc9ac7] Fixed configuration $ git bisect run ./new_test.sh running ./new_test.sh ALL CLEAR Bisecting: 0 revisions left to test after this (roughly 1 step [155cfdc11389c013609c75f5d3dd4e834f0c7f39] Great justice! running ./new_test.sh BAD THINGS

  59. running ./new_test.sh BAD THINGS Bisecting: 0 revisions left to test

    after this (roughly 0 step [2e3652251ca60b394dd6dd58b35aad2c68341b81] Some innocent chang running ./new_test.sh BAD THINGS 2e3652251ca60b394dd6dd58b35aad2c68341b81 is the first bad comm commit 2e3652251ca60b394dd6dd58b35aad2c68341b81 Author: Me <[email protected]> Date: Sat Sep 8 21:07:23 2012 -0700 ! Some innocent change ! :100644 100644 cffc75085d348cd4f418fc4d4257df03eb8c3c15 4d95ce bisect run success $ !

  60. Rebase Rebase

  61. None
  62. None
  63. None
  64. None
  65. None
  66. None
  67. None
  68. None
  69. None
  70. None
  71. None
  72. None
  73. None
  74. None
  75. None
  76. None
  77. None
  78. None
  79. None
  80. None
  81. None

  82. Don’t Overwrite Remote History

  83. But if You Do git pull --rebase

  84. Filter-Branch

  85. None
  86. None
  87. None
  88. None
  89. None
  90. None
  91. None
  92. None
  93. None
  94. None
  95. None
  96. None
  97. None
  98. None
  99. None
  100. None
  101. None
  102. None

  103. var rewriteHistoryOptions = new RewriteHistoryOptions { CommitTreeRewriter = c =>

    TreeDefinition.From(c).Remove("README"), CommitHeaderRewriter = c => CommitRewriteInfo.From(c, message: "HEYOOOO"), }; repo.Refs.RewriteHistory(rewriteHistoryOptions, repo.Head.Commits); Parlez-vous C#?

  104. Git & GitHub for Ninjas

  105. ! Git & GitHub for Ninjas

  106. ! Hub

  107. ! Hub Teaches Git about GitHub

  108. ! Fancy Cloning git clone https://github.com/mojombo/jekyll hub clone mojombo/jekyll

  109. ! Issue # Pull Request hub pull-request -i <issue>

  110. ! The Best Way alias git=hub

  111. ! Get It http://hub.github.com/

  112. ! Pull Requests

  113. ! From a Fork

  114. ! From a Fork

  115. ! From a Fork

  116. ! From a Fork

  117. ! From a Fork

  118. ! From a Fork

  119. ! From Not a Fork

  120. ! Not Just For Finished Code

  121. !

  122. !

  123. !

  124. !

  125. !

  126. !

  127. ! Markdown

  128. None
  129. None

  130. ! Emoji :sunset: ! :clap: ! :cookie: ! :poop: !

    :sheep::dash:

  131. ! Emoji http://www.emoji-cheat-sheet.com/

  132. None

  133. ⌘+shift+P   ctrl+shift+P

  134. None

  135. ! Closing Issues Spooky Action at a Distance

  136. ! With Commits

  137. ! With Pull Requests

  138. ! Mentions

  139. ! Summon a Person @ben, what do you think?

  140. ! Or a Team @github/dotcom, what do you think?

  141. ! Or a Team @github/legal, what do you think?

  142. ! Or Something Else @github/javascript, what do you think?

  143. ! Or Something Else @github/design, what do you think?

  144. ! Or Something Else @github/refactoring, what do you think?

  145. ! Or Something Else @github/colorblind, what do you think?

  146. ! Non-Code Repos

  147. None
  148. None

  149. ! Clients

  150. Use the Shell

  151. GitHub Mac

  152. GitHub Windows

  153. Full Clients http://git-scm.com/downloads/guis

  154. The Weird Stuff

  155. $

  156. ! http://git.io/LuPVlg