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

Git: Beyond the Basics

Sponsored · Ship Features Fearlessly Turn features on and off without deploys. Used by thousands of Ruby developers. →
Avatar for John Bohn John Bohn
July 10, 2012
Programming
210
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
130

Other Decks in Programming

See All in Programming
Spec-Driven Development with AI-Agents: From High-Level Requirements to Working Software
Avatar for Anton Arhipov antonarhipov
2
440
並列実装の現場、2ヶ月間実務でAIを使い倒したAIもPCも私も限界が近い
Avatar for ming ming_ayami
0
100
エージェンティックRAGにAWSで入門しよう！
Avatar for Har1101 har1101
5
110
TypeScript+Orvalで実現する型安全かつ堅牢でスケーラブルなマルチチャネル通知基盤 / TSKaigi Night talks ~after conference~
Avatar for doriven d0riven
0
160
Signal Forms: Beyond the Basics @ngBaguette 2026 in Paris
Avatar for Manfred Steyer manfredsteyer
PRO
0
220
関係性から理解する"同一性"の型用語たち
Avatar for pvcresin pvcresin
2
630
TypeScriptだけでAIエージェントを作る フロント・エージェント・インフラのフルスタック実践
Avatar for Har1101 har1101
6
1.3k
Stage 3 Decorators でできること / できないこと / TSKaigi 2026
Avatar for Susisu susisu
1
1.5k
プラグインで拡張される Context をtype-safe にする難しさと設計判断
Avatar for kazupon kazupon
2
560
技術記事、AIに書かせるか、自分で書くか？ 〜それでも私が自分の手で書く理由〜 / #QiitaConference
Avatar for Junichi Ito jnchito
2
1.3k
プロパティの順序で型推論が壊れる!? TypeScript6.0の修正からContext-Sensitivityの仕組みを追う
Avatar for おおいし bicstone
2
1.3k
気づいたらRubyで100作品 ー クリエイティブコーディングが生活の一部になるまで / 100 Ruby Sketches Later: How Creative Coding Became Part of My Life
Avatar for chobishiba chobishiba
3
530

Featured

See All Featured
New Earth Scene 8
Avatar for Sydney Stone popppiees
3
2.3k
Reality Check: Gamification 10 Years Later
Avatar for Sebastian Deterding codingconduct
0
2.2k
世界の人気アプリ100個を分析して見えたペイウォール設計の心得
Avatar for Akihiro Kokubo akihiro_kokubo
PRO
71
40k
How to Grow Your eCommerce with AI & Automation
Avatar for Katarina Dahlin katarinadahlin
PRO
1
200
The Straight Up "How To Draw Better" Workshop
Avatar for Dennis Kardys denniskardys
239
140k
Optimizing for Happiness
Avatar for Tom Preston-Werner mojombo
378
71k
A better future with KSS
Avatar for Kyle Neath kneath
240
18k
Organizational Design Perspectives: An Ontology of Organizational Design Elements
Avatar for Dr. Kim W Petersen kimpetersen
PRO
1
720
Navigating Algorithm Shifts & AI Overviews - #SMXNext
Avatar for Aleyda Solis aleyda
1
1.3k
The agentic SEO stack - context over prompts
Avatar for schlessera schlessera
0
790
職位にかかわらず全員がリーダーシップを発揮するチーム作り / Building a team where everyone can demonstrate leadership regardless of position
Avatar for MADOX madoxten
62
54k
Evolving SEO for Evolving Search Engines
Avatar for Ryan Jones ryanjones
0
210

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