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

Git: Beyond the Basics

Sponsored · SiteGround - Reliable hosting with speed, security, and support you can count on. →
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
130

Other Decks in Programming

See All in Programming
Claude Codeを組織的に動かして月400PRを実現した話
Avatar for happy_ryo happy_ryo
0
260
GraphRAGのKnowledge Graphを 直接！見る/View-GraphRAG's-KnowledgeGraph-directly!
Avatar for tyumugiko tyumugi1113
0
240
まだ間に合う！今年の夏こそSchemeのマクロ展開器を完全理解！
Avatar for Masanori Ogino omasanori
0
640
{ Android | Kotlin } Gradle Plugin in 2026
Avatar for RyuNen344 ryunen344
1
290
30年振りにコンパイラの定数整数除算を改善した
Avatar for herumi herumi
9
4.4k
ハーネス設計入門 〜プロンプト、コンテキストの次〜
Avatar for kinopee kinopeee
55
36k
Snowflakeで業務アプリを作ろう。 Snowflakeのアプリ機能解説&実践ガイド
Avatar for Ayumu Yamaguchi ayumu_yamaguchi
1
140
PHPプロジェクトの結合バランスを可視化する #php_night
Avatar for Takuma Kajikawa kajitack
0
230
「AI時代、配布するPythonコードをどう守るか: 難読化の実験と判断軸」 #PyconJP2026
Avatar for PKSHA Technology（パークシャテクノロジー） pkshadeck
PRO
2
170
自分的「カンファレンスの楽しみ方」
Avatar for syumai syumai
0
190
Laravelのアプリケーションをどこにデプロイするか #ツナギメオフライン.9
Avatar for akase244 akase244
0
120
高専、大学編入、そして未踏へ〜プロダクト開発とキャリアの歩み - Technical College, University Transfer, and On to “Mitou” / My Journey in Product Development and Career
Avatar for __pkmiya pkmiya
0
140

Featured

See All Featured
Taking LLMs out of the black box: A practical guide to human-in-the-loop distillation
Avatar for Ines Montani inesmontani
PRO
3
2.4k
A brief & incomplete history of 
UX Design for the World Wide Web: 1989–2019
Avatar for Jason CranfordTeague jct
2
500
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
Avatar for Michelle Schulp Hunt marktimemedia
31
2.9k
Navigating the Design Leadership Dip - Product Design Week Design Leaders+ Conference 2024
Avatar for Andy Polaine apolaine
2
410
Docker and Python
Avatar for Tania Allard trallard
47
4.2k
For a Future-Friendly Web
Avatar for Brad Frost brad_frost
183
10k
Fight the Zombie Pattern Library - RWD Summit 2016
Avatar for Marcelo Somers marcelosomers
234
17k
The Pragmatic Product Professional
Avatar for Laura Van Doore lauravandoore
37
7.4k
Building Flexible Design Systems
Avatar for Yesenia Perez-Cruz yeseniaperezcruz
330
41k
AI in Enterprises - Java and Open Source to the Rescue
Avatar for ivargrimstad ivargrimstad
0
1.5k
The Illustrated Guide to Node.js - THAT Conference 2024
Avatar for David Neal reverentgeek
1
470
Reflections from 52 weeks, 52 projects
Avatar for Jefferson Lam jeffersonlam
356
21k

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