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

Git, Unicorns and Rainbows

Sponsored · Ship Features Fearlessly Turn features on and off without deploys. Used by thousands of Ruby developers. →
Avatar for ubermuda ubermuda
October 27, 2011
Technology
3
200

Git, Unicorns and Rainbows

A small compilation of some git jaw dropping features

Avatar for ubermuda

ubermuda

October 27, 2011
Tweet

More Decks by ubermuda

See All by ubermuda
La théorie des graphes appliquée à Git
Avatar for ubermuda ubermuda
0
410
Comment Docker révolutionne le web
Avatar for ubermuda ubermuda
3
710
Vers des applications twelve-factor
Avatar for ubermuda ubermuda
2
1.1k
Git et la théorie des graph
Avatar for ubermuda ubermuda
3
1.1k
Introduction à Docker
Avatar for ubermuda ubermuda
6
1.1k
Meetup Docker 101
Avatar for ubermuda ubermuda
1
230
A multi-container Symfony2 setup with Docker
Avatar for ubermuda ubermuda
40
12k
Docker Introduction
Avatar for ubermuda ubermuda
5
520
Symfony 2, un framework robuste et moderne
Avatar for ubermuda ubermuda
5
200

Other Decks in Technology

See All in Technology
「お金で解決」が全てではない！大規模WebアプリのCI高速化 #phperkaigi
Avatar for すてにゃん stefafafan
5
2.2k
PostgreSQL 18のNOT ENFORCEDな制約とDEFERRABLEの関係
Avatar for Yasuo Honda yahonda
0
120
LLMに何を任せ、何を任せないか
Avatar for an cap120
10
5.1k
FlutterでPiP再生を実装した話
Avatar for 白井翔大 s9a17
0
150
FastMCP OAuth Proxy with Cognito
Avatar for iganin hironobuiga
3
190
Phase07_実務適用
Avatar for overflow ,Inc overflowinc
0
1.8k
Phase12_総括_自走化
Avatar for overflow ,Inc overflowinc
0
1.4k
Phase11_戦略的AI経営
Avatar for overflow ,Inc overflowinc
0
1.5k
Laravelで学ぶOAuthとOpenID Connectの基礎と実装
Avatar for Koji Yoshida kyoshidaxx
4
1.8k
「捨てる」を設計する
Avatar for kubell kubell_hr
0
230
事例から紐解くSHIFT流QA支援 ～大規模プロジェクトの品質管理支援、QA組織立ち上げ～ / 20260320 Nozomu Koketsu
Avatar for SHIFT EVOLVE shift_evolve
PRO
0
140
データマネジメント戦略Night - 4社のリアルを語る会
Avatar for Tatsuya Koreeda ktatsuya
1
220

Featured

See All Featured
Building a A Zero-Code AI SEO Workflow
Avatar for Ian Lurie portentint
PRO
0
410
Money Talks: Using Revenue to Get Sh*t Done
Avatar for Nikki Halliwell nikkihalliwell
0
190
Leveraging LLMs for student feedback in introductory data science courses - posit::conf(2025)
Avatar for Mine Cetinkaya-Rundel minecr
1
210
VelocityConf: Rendering Performance Case Studies
Avatar for Addy Osmani addyosmani
333
24k
How Fast Is Fast Enough? [PerfNow 2025]
Avatar for Tammy Everts tammyeverts
3
500
Visualization
Avatar for Eitan Lees eitanlees
150
17k
Reflections from 52 weeks, 52 projects
Avatar for Jefferson Lam jeffersonlam
356
21k
Primal Persuasion: How to Engage the Brain for Learning That Lasts
Avatar for Mike Taylor tmiket
0
300
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
Avatar for Sam Stephenson sstephenson
162
16k
RailsConf 2023
Avatar for Aaron Patterson tenderlove
30
1.4k
[RailsConf 2023] Rails as a piece of cake
Avatar for Vladimir Dementyev palkan
59
6.4k
Fantastic passwords and where to find them - at NoRuKo
Avatar for Phil Nash philnash
52
3.6k

Transcript

  1. Git, Unicorns and Rainbows Geoffrey Bachelet — KnpLabs Wednesday, September

    21, 11

  2. Not your average git talk Wednesday, September 21, 11

  3. Ready? Wednesday, September 21, 11

  4. Forgot something in your commit? Wednesday, September 21, 11

  5. git --amend Wednesday, September 21, 11

  6. git --amend • Add files to a commit • Remove

    files from a commit • Change a commit’s message Wednesday, September 21, 11

  7. Partially commit a file? Wednesday, September 21, 11

  8. git add -p Wednesday, September 21, 11

  9. git add -p • Stage only the chunks of diff

    you want • Intelligent chunking (chunk more!) • Manual chunk edit Wednesday, September 21, 11

  10. Tweak your commit history before pushing? Wednesday, September 21, 11

  11. git rebase -i Wednesday, September 21, 11

  12. git rebase -i • Change commits order • Edit commits

    (just like commit --amend) • Squash commits together Wednesday, September 21, 11

  13. Internet just went down? Wednesday, September 21, 11

  14. Work locally! Wednesday, September 21, 11

  15. Work locally! • Commit • Create / merge branches •

    What you can’t do: push and fetch Wednesday, September 21, 11

  16. Want to create a shitload of branches? Wednesday, September 21,

    11

  17. Branches are cheap as fuck. Wednesday, September 21, 11

  18. Branches are cheap • A branch is just a ref

    to a commit • That is, a 40 bytes file • Containing a sha1 Wednesday, September 21, 11

  19. Woops, I should have branched that? Wednesday, September 21, 11

  20. It’s never too late. Wednesday, September 21, 11

  21. It’s never too late • Mark your current commit •

    Switch back to previous branch • Reset to branch start-point Wednesday, September 21, 11

  22. The build is broken? Wednesday, September 21, 11

  23. git bisect Wednesday, September 21, 11

  24. git bisect • Tell git a commit for which the

    build works • And a commit for which it’s broken • It will find the commit that breaks! Wednesday, September 21, 11

  25. You commited your database password? Wednesday, September 21, 11

  26. git filter-branch Wednesday, September 21, 11

  27. git filter-branch • Crawls your history • Runs commands on

    it • And voila! Wednesday, September 21, 11