Upgrade to Pro — share decks privately, control downloads, hide ads and more …
Sign up for free

Git, Unicorns and Rainbows

Sponsored · Your Podcast. Everywhere. Effortlessly. Share. Educate. Inspire. Entertain. You do you. We'll handle the rest. →
Avatar for ubermuda ubermuda
October 27, 2011
Technology
220
3

Git, Unicorns and Rainbows

A small compilation of some git jaw dropping features

Avatar for ubermuda

ubermuda

October 27, 2011

More Decks by ubermuda

See All by ubermuda
La théorie des graphes appliquée à Git
Avatar for ubermuda ubermuda
0
430
Comment Docker révolutionne le web
Avatar for ubermuda ubermuda
3
730
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
240
A multi-container Symfony2 setup with Docker
Avatar for ubermuda ubermuda
40
12k
Docker Introduction
Avatar for ubermuda ubermuda
5
560
Symfony 2, un framework robuste et moderne
Avatar for ubermuda ubermuda
5
220

Other Decks in Technology

See All in Technology
AI時代のAPI品質を支えるガードレール / API Guardrails for API quality in the AI ​​era
Avatar for Yoichi Kawasaki yokawasa
1
180
コスト最適化の「めんどくさい」を AWS FinOps Agent でチョット楽にする
Avatar for kaz classmethod_kaz
0
280
リージョンの壁を越える、 ちょっと変わったAWSサービスの話
Avatar for Michael Tedder falken
PRO
0
280
現場に行くだけでは足りない——プロダクトエンジニアが業務の流れを捉える観点と、その鍛え方
Avatar for 匠技研工業株式会社 / Takumi Engineering, inc. takumiengineering
0
350
Jetpack Compose で挑む新聞紙面UI ─ 複合ジェスチャー・ポリゴン記事領域・適応的ページ構成という3つの壁/droidkaigi2026
Avatar for 日本経済新聞社 エンジニア採用事務局 nikkei_engineer_recruiting
0
240
幾何アルゴリズムで なめらかなピン操作を / iOSDC Japan 2026 / smoothpin
Avatar for nade kazumanagano
0
220
Screen Lens - 今見てる画面を翻訳する
Avatar for komagata komagata
0
150
OpenTelemetry eBPF Instrumentationの舞台裏 / Behind the Scenes of OpenTelemetry eBPF Instrumentation
Avatar for ymotongpoo ymotongpoo
3
400
AI-DLCって実際どう？ 〜聞きたいこと全部聞いてみる〜
Avatar for 荒木 ARK news_it_enj
0
240
SQL文一行も書けない人事がCortexもろもろを使って人事業務を楽にしてみる
Avatar for ponponmikan ponponmikankan
1
170
Nav2、Nav3 ... はたまた自作？〜 作って理解する Nav3 の設計意図 〜 / Nav2, Nav3 ... or Build Your Own? — Understanding Nav3's design intent by building it from scratch
Avatar for Yuki Anzai yanzm
0
260
When Does a Local Qwen Start to Break
Avatar for Shoto morshoto
0
190

Featured

See All Featured
Optimizing for Happiness
Avatar for Tom Preston-Werner mojombo
378
71k
Practical Orchestrator
Avatar for Shlomi Noach shlominoach
191
12k
Bioeconomy Workshop: Dr. Julius Ecuru, Opportunities for a Bioeconomy in West Africa
Avatar for AKADEMIYA2063 akademiya2063
PRO
1
340
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
Avatar for Addy Osmani addyosmani
10
1.3k
Designing Dashboards & Data Visualisations in Web Apps
Avatar for Des Traynor destraynor
232
55k
Paper Plane
Avatar for Katie Cordina Lindsey katiecoart
PRO
2
53k
How to Build an AI Search Optimization Roadmap - Criteria and Steps to Take #SEOIRL
Avatar for Aleyda Solis aleyda
1
2.2k
Game over? The fight for quality and originality in the time of robots
Avatar for Wayne Barker wayneb77
1
270
Introduction to Domain-Driven Design and Collaborative software design
Avatar for Kenny Baas-Schwegler baasie
1
970
Ruling the World: When Life Gets Gamed
Avatar for Sebastian Deterding codingconduct
0
330
Public Speaking Without Barfing On Your Shoes - THAT 2023
Avatar for David Neal reverentgeek
1
560
Rails Girls Zürich Keynote
Avatar for Gregor Martynus gr2m
96
14k

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