Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
Git, Unicorns and Rainbows
Search
ubermuda
October 27, 2011
Technology
3
190
Git, Unicorns and Rainbows
A small compilation of some git jaw dropping features
ubermuda
October 27, 2011
Tweet
Share
More Decks by ubermuda
See All by ubermuda
La théorie des graphes appliquée à Git
ubermuda
0
380
Comment Docker révolutionne le web
ubermuda
3
680
Vers des applications twelve-factor
ubermuda
2
1k
Git et la théorie des graph
ubermuda
3
1k
Introduction à Docker
ubermuda
6
1k
Meetup Docker 101
ubermuda
1
210
A multi-container Symfony2 setup with Docker
ubermuda
40
12k
Docker Introduction
ubermuda
5
470
Symfony 2, un framework robuste et moderne
ubermuda
5
190
Other Decks in Technology
See All in Technology
データ駆動経営の道しるべ:プロダクト開発指標の戦略的活用法
ham0215
2
230
室長の逆襲 :データ活用の陣地を増やすためのヒント
masatoshi0205
0
180
なぜAI時代に 「イベント」を中心に考えるのか? / Why focus on "events" in the age of AI?
ytake
2
510
CSPヘッダー導入で実現するWebサイトの多層防御:今すぐ試せる設定例と運用知見
llamakko
1
190
MCP とマネージド PaaS で実現する大規模 AI アプリケーションの高速開発
nahokoxxx
1
1.4k
少人数でも回る! DevinとPlaybookで支える運用改善
ishikawa_pro
1
200
AI駆動開発 with MixLeap Study【大阪支部 #3】
lycorptech_jp
PRO
0
200
Ktor + Google Cloud Tasks/PubSub におけるOTel Messaging計装の実践
sansantech
PRO
1
260
20250719_JAWS_kobe
takuyay0ne
1
160
公開初日に個人環境で試した Gemini CLI 体験記など / Gemini CLI実験レポート
you
PRO
3
320
Railsの限界を超えろ!「家族アルバム みてね」の画像・動画の大規模アップロードを支えるアーキテクチャの変遷
ojima_h
3
390
東京海上日動におけるセキュアな開発プロセスの取り組み
miyabit
0
120
Featured
See All Featured
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
irinanazarova
8
850
Designing for Performance
lara
610
69k
Art, The Web, and Tiny UX
lynnandtonic
301
21k
No one is an island. Learnings from fostering a developers community.
thoeni
21
3.4k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
161
15k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
138
34k
GraphQLの誤解/rethinking-graphql
sonatard
71
11k
Designing for humans not robots
tammielis
253
25k
Automating Front-end Workflow
addyosmani
1370
200k
How to Create Impact in a Changing Tech Landscape [PerfNow 2023]
tammyeverts
53
2.9k
Why Our Code Smells
bkeepers
PRO
337
57k
Gamification - CAS2011
davidbonilla
81
5.4k
Transcript
Git, Unicorns and Rainbows Geoffrey Bachelet — KnpLabs Wednesday, September
21, 11
Not your average git talk Wednesday, September 21, 11
Ready? Wednesday, September 21, 11
Forgot something in your commit? Wednesday, September 21, 11
git --amend Wednesday, September 21, 11
git --amend • Add files to a commit • Remove
files from a commit • Change a commit’s message Wednesday, September 21, 11
Partially commit a file? Wednesday, September 21, 11
git add -p Wednesday, September 21, 11
git add -p • Stage only the chunks of diff
you want • Intelligent chunking (chunk more!) • Manual chunk edit Wednesday, September 21, 11
Tweak your commit history before pushing? Wednesday, September 21, 11
git rebase -i Wednesday, September 21, 11
git rebase -i • Change commits order • Edit commits
(just like commit --amend) • Squash commits together Wednesday, September 21, 11
Internet just went down? Wednesday, September 21, 11
Work locally! Wednesday, September 21, 11
Work locally! • Commit • Create / merge branches •
What you can’t do: push and fetch Wednesday, September 21, 11
Want to create a shitload of branches? Wednesday, September 21,
11
Branches are cheap as fuck. Wednesday, September 21, 11
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
Woops, I should have branched that? Wednesday, September 21, 11
It’s never too late. Wednesday, September 21, 11
It’s never too late • Mark your current commit •
Switch back to previous branch • Reset to branch start-point Wednesday, September 21, 11
The build is broken? Wednesday, September 21, 11
git bisect Wednesday, September 21, 11
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
You commited your database password? Wednesday, September 21, 11
git filter-branch Wednesday, September 21, 11
git filter-branch • Crawls your history • Runs commands on
it • And voila! Wednesday, September 21, 11