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

Git, Unicorns and Rainbows

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
390
Comment Docker révolutionne le web
Avatar for ubermuda ubermuda
3
680
Vers des applications twelve-factor
Avatar for ubermuda ubermuda
2
1.1k
Git et la théorie des graph
Avatar for ubermuda ubermuda
3
1k
Introduction à Docker
Avatar for ubermuda ubermuda
6
1k
Meetup Docker 101
Avatar for ubermuda ubermuda
1
210
A multi-container Symfony2 setup with Docker
Avatar for ubermuda ubermuda
40
12k
Docker Introduction
Avatar for ubermuda ubermuda
5
480
Symfony 2, un framework robuste et moderne
Avatar for ubermuda ubermuda
5
190

Other Decks in Technology

See All in Technology
空間を設計する力を考える / 20251004 Naoki Takahashi
Avatar for SHIFT EVOLVE shift_evolve
PRO
3
340
職種別ミートアップで社内から盛り上げる アウトプット文化の醸成と関係強化/ #DevRelKaigi
Avatar for Ichiro Nishiuma nishiuma
2
140
GC25 Recap+: Advancing Go Garbage Collection with Green Tea
Avatar for Takuto Nagami logica0419
1
410
LLMアプリケーション開発におけるセキュリティリスクと対策 / LLM Application Security
Avatar for GMO Flatt Security flatt_security
7
1.9k
定期的な価値提供だけじゃない、スクラムが導くチームの共創化 / 20251004 Naoki Takahashi
Avatar for SHIFT EVOLVE shift_evolve
PRO
3
310
JAZUG 15周年記念 × JAT「AI Agent開発者必見："今"のOracle技術で拡張するAzure × OCIの共存アーキテクチャ」
Avatar for KoheiOgawa shisyu_gaku
0
110
KAGのLT会 #8 - 東京リージョンでGAしたAmazon Q in QuickSightを使って、報告用の資料を作ってみた
Avatar for arap / 0air 0air
0
200
Azure SynapseからAzure Databricksへ 移行してわかった新時代のコスト問題！？
Avatar for Databricks Japan databricksjapan
0
140
小学4年生夏休みの自由研究「ぼくと Copilot エージェント」
Avatar for Taichi Nakamura taichinakamura
0
230
AWSにおけるTrend Vision Oneの効果について
Avatar for shima shimak
0
130
後進育成のしくじり〜任せるスキルとリーダーシップの両立〜
Avatar for mtskhs matsu0228
7
2.5k
バイブコーディングと継続的デプロイメント
Avatar for nwiizo nwiizo
2
430

Featured

See All Featured
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
Avatar for Sam Stephenson sstephenson
162
15k
How STYLIGHT went responsive
Avatar for nonsquared nonsquared
100
5.8k
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
Avatar for Addy Osmani addyosmani
7
890
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
Avatar for Eileen M. Uchitelle eileencodes
140
34k
It's Worth the Effort
Avatar for 3n 3n
187
28k
StorybookのUI Testing Handbookを読んだ
Avatar for Shingo Yamazaki zakiyama
31
6.2k
ReactJS: Keep Simple. Everything can be a component!
Avatar for Pedro Nauck pedronauck
667
120k
How To Stay Up To Date on Web Technology
Avatar for Chris Coyier chriscoyier
791
250k
Improving Core Web Vitals using Speculation Rules API
Avatar for Sergey Chernyshev sergeychernyshev
19
1.2k
Fireside Chat
Avatar for paigeccino paigeccino
40
3.7k
The Pragmatic Product Professional
Avatar for Laura Van Doore lauravandoore
36
6.9k
Visualization
Avatar for Eitan Lees eitanlees
148
16k

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