Upgrade to Pro — share decks privately, control downloads, hide ads and more …
Sign up for free

Git: Beyond the Basics

Avatar for John Bohn John Bohn
July 10, 2012
Programming
220
4

Git: Beyond the Basics

Avatar for John Bohn

John Bohn

July 10, 2012

More Decks by John Bohn

See All by John Bohn
SOLID Design Principles in Ruby
Avatar for John Bohn jjbohn
2
140

Other Decks in Programming

See All in Programming
AI時代のIaC入門 〜なぜインフラをコードで管理したいのか？〜 / Introduction to IaC in the AI Era
Avatar for アキキー | Akihisa Ikeda akihisaikeda
5
1.1k
AIが生成したコードは読むべきか？抽象化設計とコードの品質保証 / abstraction-design-and-quality
Avatar for MinoDriven minodriven
11
6.9k
GraphQL の onError と Nullability のこれから
Avatar for Yosuke Kurami quramy
0
190
AIがコードを書いてくれる時代、我々は何を確かめるのか
Avatar for Yosuke Furukawa yosuke_furukawa
PRO
12
5k
Herb in Rails 8.2: Your ERB views, now HTML-aware @ Kaigi on Rails 2026, Tokyo, Japan
Avatar for Marco Roth marcoroth
2
360
プロジェクトコードをキレイキレイしよう！暗黙的な参照を読み解く静的解析
Avatar for Takuma Osada ostk0069
0
130
No More NoSuchMethodError
Avatar for TATSUNO Yasuhiro exoego
1
120
contenteditable と日本語入力に向き合う
Avatar for taki colorful12
0
230
動画プレイヤーはなぜカクつくのか 〜Flutterのレンダリングとネイティブの境界を解剖する〜
Avatar for Naruo Yoshiki naruogram
0
170
パスワード再設定メールのURLについて知っておこう
Avatar for uyuki uyuki234
0
190
Vue.jsで作る空間解析アプリとCapacitorプラグインのData Bridge
Avatar for Hal hal_spidernight
1
120
Groovy as a human and AI friendly programming language
Avatar for paulking paulk
0
120

Featured

See All Featured
It's Worth the Effort
Avatar for 3n 3n
188
29k
State of Search Keynote: SEO is Dead Long Live SEO
Avatar for Ryan Jones ryanjones
0
330
The Anti-SEO Checklist Checklist. Pubcon Cyber Week
Avatar for Ryan Jones ryanjones
0
270
The browser strikes back
Avatar for Jono Alderson jonoalderson
0
1.9k
Speed Design
Avatar for Sergey Chernyshev sergeychernyshev
33
2.2k
Bridging the Design Gap: How Collaborative Modelling removes blockers to flow between stakeholders and teams @FastFlow conf
Avatar for Kenny Baas-Schwegler baasie
0
740
ラッコキーワード サービス紹介資料
Avatar for ラッコ株式会社 rakko
5
5.5M
Fashionably flexible responsive web design (full day workshop)
Avatar for Andy Clarke malarkey
409
67k
Git: the NoSQL Database
Avatar for Brandon Keepers bkeepers
PRO
433
67k
HDC tutorial
Avatar for Michiel Stock michielstock
2
980
AI: The stuff that nobody shows you
Avatar for John Nunemaker jnunemaker
PRO
10
1.2k
コードの90%をAIが書く世界で何が待っているのか / What awaits us in a world where 90% of the code is written by AI
Avatar for r-kagaya rkaga
63
47k

Transcript

  1. gitbeyond the basics Thursday, August 2, 12

  2. John Bohn @jjbohn Thursday, August 2, 12

  3. Developer at OpenSky curated social commerce Thursday, August 2, 12

  4. git what is Thursday, August 2, 12

  5. git is fast and lightweight free/open source distributed crazy simple

    Thursday, August 2, 12

  6. init branch add commit merge Thursday, August 2, 12

  7. Almost any VCS works does this (more or less) What

    is special about git? Thursday, August 2, 12

  8. Interactivity Thursday, August 2, 12

  9. git add --patch git add --interactive Thursday, August 2, 12

  10. Arduino Example Thursday, August 2, 12

  11. Change Blink Thursday, August 2, 12

  12. Change Blink - Two logical changes - Don’t want to

    bother undoing one - Can’t git add . or git add [file] Thursday, August 2, 12

  13. git add --patch Thursday, August 2, 12

  14. git add --patch Thursday, August 2, 12

  15. git add --patch Thursday, August 2, 12

  16. git add --patch Commit the change Thursday, August 2, 12

  17. git add --patch Stage other changes Diff is now empty

    (everything is staged or commited) Thursday, August 2, 12

  18. git stash Thursday, August 2, 12

  19. is super boring Thursday, August 2, 12

  20. until you throw some flags at it... Thursday, August 2,

    12

  21. git stash --no-keep-index git stash --keep-index git stash --patch git

    stash --include-untracked My Favorites Thursday, August 2, 12

  22. Finding these commands is just a matter of digging Thursday,

    August 2, 12

  23. git anything --help Thursday, August 2, 12

  24. git reset is not git revert Thursday, August 2, 12

  25. git reset --soft [sha] git reset --hard [sha] git reset

    --mixed [sha] Thursday, August 2, 12

  26. You can also: git reset --patch (but not with those

    modes) Thursday, August 2, 12

  27. Bisecting aka: Finding a commit that screwed things up. Thursday,

    August 2, 12

  28. Bisecting Thursday, August 2, 12

  29. Bisecting 7b35b 91296 9680d 2ab1f c6d43 6 Commits - One

    Bug We know that 7b35b is good We know that cfc332 is bad But we have no idea where the bug was introduced cfc332 Thursday, August 2, 12

  30. Bisecting 7b35b 91296 9680d 2ab1f c6d43 Tell git what is

    known good and bad cfc332 good bad Thursday, August 2, 12

  31. Bisecting 7b35b 91296 9680d 2ab1f c6d43 cfc332 good bad Thursday,

    August 2, 12

  32. Bisecting 7b35b 91296 9680d 2ab1f c6d43 cfc332 good bad good

    Thursday, August 2, 12

  33. Bisecting 7b35b 91296 9680d 2ab1f c6d43 cfc332 good bad good

    good Thursday, August 2, 12

  34. Bisecting 7b35b 91296 9680d 2ab1f c6d43 cfc332 good bad good

    good 2ab1f is most likely good because the commit after it is Thursday, August 2, 12

  35. Bisecting 7b35b 91296 9680d 2ab1f c6d43 cfc332 good bad good

    good bad Thursday, August 2, 12

  36. Bisecting 7b35b 91296 9680d 2ab1f c6d43 cfc332 good bad good

    good bad bad Thursday, August 2, 12

  37. Recovering lost commits Thursday, August 2, 12

  38. git reflog Thursday, August 2, 12

  39. git reflog Technically shows any action where the tip of

    a branch is modified git reflog --all shows stashes, bisects, etc. Thursday, August 2, 12

  40. Recovery Let’s say I reset --hard and wiped out the

    commit that changed my LED to pin 10 Use combination of reflog and cherry-pick to get it back Thursday, August 2, 12

  41. Recovery Found it! 3ecdba3 Thursday, August 2, 12

  42. Recovery Double check that 3ecdba3 is really the commit we

    want git diff 3ecdba3^.. 3ecdba3 Shows me the difference between the commit I want to cherry pick and the commit prior. Thursday, August 2, 12

  43. git cherry-pick Now cherry pick 3ecdba3 into our working tree

    Note: the sha has changed because this commit now has a different parent than it did when it was recorded into the reflog Thursday, August 2, 12

  44. Recovery Checkout the reflog again to see the cherry-pick Thursday,

    August 2, 12

  45. Interactive Rebasing Changing the past one commit at a time

    Thursday, August 2, 12

  46. git rebase -i [commit] Thursday, August 2, 12

  47. git rebase -i [commit] Thursday, August 2, 12

  48. git rebase -i [commit] Thursday, August 2, 12

  49. git rebase -i [commit] Thursday, August 2, 12

  50. Interactive rebase Thursday, August 2, 12

  51. git internals The plumbing and the porcelain Thursday, August 2,

    12

  52. git internals git stores snapshots, not differences Storing differences is

    slow and inflexible CVS/Subversion git Thursday, August 2, 12

  53. git internals git stores snapshots, not differences Storing differences is

    slow and inflexible CVS/Subversion git Thursday, August 2, 12

  54. git internals What does a commit look like? Thursday, August

    2, 12

  55. git internals Let’s investigate a repo Sorry for the bad

    “investigation” image ;-) Thursday, August 2, 12

  56. Thanks! Come work with me at OpenSky! We’re Hiring Thursday,

    August 2, 12