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

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
130

Other Decks in Programming

See All in Programming
Gmail/Google DriveをトリガーにAIエージェントを動かそう！ / Run AI agents with Gmail/Google Drive as triggers!
Avatar for Har1101 har1101
2
450
わからない話を追いかけたら、プログラミング言語を作る側にいた
Avatar for ydah ydah
3
560
使いながら育てる Claude Code — 開発フローの1コマンド化 × 繰り返し指摘の自動仕組み化
Avatar for endo shiki shiki_kakaku
1
2k
VibeCodingからAgenticWorkflowへ
Avatar for starfish719 starfish719
0
940
Deep dive into the select statement (GopherCon UK)
Avatar for Jesús Espino jespino
0
150
Jindong: Introducing Declarative Haptics in Compose Multiplatform
Avatar for HyunWoo Lee l2hyunwoo
0
130
[PyCon KR 2026] More Variants, More Diversity for AI Accelerators
Avatar for Joongi Kim achimnol
0
120
生成AIで帳票OCRが「簡単に」作れる時代になった？
Avatar for Shohei Kondo kon_shou
0
1.2k
初心者DevRelとして参加者だった私が、DevRel Talks!#2に登壇するまでにしてきたこと
Avatar for Rai sokohirai
0
160
私のClaude Code活用法 （個人開発編） - PHPerKaigi mini #4（2026/08/24）
Avatar for panda_program panda_program
1
190
書籍「プロフェッショナルAI駆動開発」紹介スライド
Avatar for Juntaro Matsumoto juntaromatsumoto
0
780
片田舎のおっさん、 Swift Buildのダイアモンド問題解決の不具合修正PRを出すが、解決方法がキャッシュをしないようにすることであり、ビルド時間が伸びると言われてマージされないので高速化もする/swiftbuild
Avatar for yimajo yimajo
0
310

Featured

See All Featured
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
Avatar for Michelle Schulp Hunt marktimemedia
31
2.9k
Building an army of robots
Avatar for Kyle Neath kneath
306
46k
The Language of Interfaces
Avatar for Des Traynor destraynor
162
27k
How to Think Like a Performance Engineer
Avatar for Harry Roberts csswizardry
28
2.7k
Marketing Yourself as an Engineer | Alaka | Gurzu
Avatar for Gurzu gurzu
0
280
HDC tutorial
Avatar for Michiel Stock michielstock
2
820
Ruling the World: When Life Gets Gamed
Avatar for Sebastian Deterding codingconduct
0
310
Future Trends and Review - Lecture 12 - Web Technologies (1019888BNR)
Avatar for Beat Signer signer
PRO
0
3.7k
[RailsConf 2023 Opening Keynote] The Magic of Rails
Avatar for Eileen M. Uchitelle eileencodes
31
10k
StorybookのUI Testing Handbookを読んだ
Avatar for Shingo Yamazaki zakiyama
31
6.9k
How Fast Is Fast Enough? [PerfNow 2025]
Avatar for Tammy Everts tammyeverts
3
830
Building a Modern Day 
E-commerce SEO Strategy
Avatar for Aleyda Solis aleyda
45
9.2k

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