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

AppsWorld Europe 2013 - Git & GitHub for Ninjas

Ben Straub
October 23, 2013
Programming
1
140

AppsWorld Europe 2013 - Git & GitHub for Ninjas

More notes at https://gist.github.com/ben/c863ebce224d7260656b

Ben Straub

October 23, 2013
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
Mastering Git and GitHub (ConFoo 2014)
benstraub
5
360
Switching to Git – Why and How (ConFoo 2014)
benstraub
1
100
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
Go の GC の不得意な 部分を克服したい
taiyow
3
810
tidymodelsによるtidyな生存時間解析 / Japan.R2024
dropout009
1
800
PHPで学ぶプログラミングの教訓 / Lessons in Programming Learned through PHP
nrslib
3
340
フロントエンドのディレクトリ構成どうしてる？　Feature-Sliced Design 導入体験談
osakatechlab
8
4.1k
Fibonacci Function Gallery - Part 1
philipschwarz
PRO
0
220
Stackless и stackful? Корутины и асинхронность в Go
lamodatech
0
880
短期間での新規プロダクト開発における「コスパの良い」Goのテスト戦略」 / kamakura.go
n3xem
2
170
ChatGPT とつくる PHP で OS 実装
memory1994
PRO
2
120
Jakarta EE meets AI
ivargrimstad
0
260
見えないメモリを観測する: PHP 8.4 `pg_result_memory_size()` とSQL結果のメモリ管理
kentaroutakeda
0
450
テストコード書いてみませんか？
onopon
2
170
Haze - Real time background blurring
chrisbanes
1
520

Featured

See All Featured
The Success of Rails: Ensuring Growth for the Next 100 Years
eileencodes
44
6.9k
A better future with KSS
kneath
238
17k
YesSQL, Process and Tooling at Scale
rocio
169
14k
Become a Pro
speakerdeck
PRO
26
5k
Navigating Team Friction
lara
183
15k
Typedesign – Prime Four
hannesfritz
40
2.4k
Testing 201, or: Great Expectations
jmmastey
40
7.1k
Designing for Performance
lara
604
68k
Building Adaptive Systems
keathley
38
2.3k
Creating an realtime collaboration tool: Agile Flush - .NET Oxford
marcduiker
26
1.9k
10 Git Anti Patterns You Should be Aware of
lemiorhan
PRO
656
59k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
232
17k

Transcript

  1.  Git & GitHub for Ninjas

  2.  What to Expect not

  3.  What to Expect

  4.  ben  benstraub Ben Straub

  5. None
  6. None

  7.  Git & GitHub for Ninjas

  8. Git & GitHub for Ninjas

  9. Shell

  10.  bash

  11.  zsh

  12.  powershell

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

    --abbrev-commit --decorate

  14. Git Is Simple

  15. Objects and Refs

  16. Objects Are Easy

  17. $ 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

  18. $ 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

  19. $ 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 Commit

  20. $ 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 201 Tag on tag Tag Annotation

  21. Refs are Easy

  22. $ cat refs/heads/master 2b67270f960563c55dd6c66495517bccc4f7fb17 Refs

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

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

  25. Symbolic Refs

  26. Symbolic Refs • branch -> commit

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

    -> commit

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

    -> commit • tag -> commit

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

    -> commit • tag -> commit • tag -> annotation -> commit

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

    -> commit • tag -> commit • tag -> annotation -> commit • tag -> blob

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

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

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

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

  33. Git Is Simple?

  34. Bisect

  35. None
  36. None
  37. None
  38. None
  39. None
  40. None
  41. None
  42. None
  43. None
  44. None
  45. None
  46. None
  47. None
  48. None
  49. None
  50. None

  51. Rebase Rebase

  52. None
  53. None
  54. None
  55. None
  56. None
  57. None
  58. None
  59. None
  60. None
  61. None
  62. None
  63. None
  64. None
  65. None
  66. None
  67. None
  68. None
  69. None

  70. Filter-Branch

  71. None
  72. None
  73. None
  74. None
  75. None
  76. None
  77. None

  78. Don’t Overwrite Remote History

  79. But if You Do git pull --rebase

  80. Git & GitHub for Ninjas

  81.  Git & GitHub for Ninjas

  82.  Hub

  83.  Hub Teaches Git about GitHub

  84.  Fancy Cloning git clone https://github.com/mojombo/jekyll

  85.  Fancy Cloning git clone https://github.com/mojombo/jekyll hub clone mojombo/jekyll

  86.  Issue  Pull Request hub pull-request -i <issue>

  87.  The Best Way alias git=hub

  88.  Get It http://hub.github.com/

  89.  Pull Requests

  90.  From a Fork

  91.  From Not a Fork

  92.  Not Just For Finished Code

  99.  Markdown

  100. None
  101. None

  102.  Emoji :sunset: :clap: :cookie: :poop: :sheep::dash:

  103.  Emoji h p://www.emoji-cheat-sheet.com/

  104. None

  105. ⌘      

  106. None

  107.  Closing Issues Spooky Action at a Distance

  108.  With Commits

  109.  With Commits

  110.  With Pull Requests

  111.  With Pull Requests

  112.  Mentions

  113.  Summon a Person @ben, what do you think?

  114.  Or a Team @github/dotcom, what do you think?

  115.  Or a Team @github/legal, what do you think?

  116.  Or Something Else @github/javascript, what do you think?

  117.  Or Something Else @github/design, what do you think?

  118.  Or Something Else @github/refactoring, what do you think?

  119.  Or Something Else @github/colorblind, what do you think?

  120.  Non-Code Repos

  121. None
  122. None

  123.  Clients

  124. GitHub Mac

  125. GitHub Windows

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

  127. The Weird Stuff

  128.  http://git.io/LuPVlg