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
200
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
390
Comment Docker révolutionne le web
ubermuda
3
680
Vers des applications twelve-factor
ubermuda
2
1.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
490
Symfony 2, un framework robuste et moderne
ubermuda
5
190
Other Decks in Technology
See All in Technology
Introduction to Sansan, inc / Sansan Global Development Center, Inc.
sansan33
PRO
0
2.8k
ユーザーの声とAI検証で進める、プロダクトディスカバリー
sansantech
PRO
1
140
新規事業におけるGORM+SQLx併用アーキテクチャ
hacomono
PRO
0
240
LLMアプリの地上戦開発計画と運用実践 / 2025.10.15 GPU UNITE 2025
smiyawaki0820
1
530
「れきちず」のこれまでとこれから - 誰にでもわかりやすい歴史地図を目指して / FOSS4G 2025 Japan
hjmkth
1
300
やる気のない自分との向き合い方/How to Deal with Your Unmotivated Self
sanogemaru
0
500
Geospatialの世界最前線を探る [2025年版]
dayjournal
1
220
小学4年生夏休みの自由研究「ぼくと Copilot エージェント」
taichinakamura
0
700
LLM時代にデータエンジニアの役割はどう変わるか?
ikkimiyazaki
6
1.3k
Large Vision Language Modelを用いた 文書画像データ化作業自動化の検証、運用 / shibuya_AI
sansan_randd
0
150
プレーリーカードを活用しよう❗❗デジタル名刺交換からはじまるイベント会場交流のススメ
tsukaman
0
150
AI時代こそ求められる設計力- AWSクラウドデザインパターン3選で信頼性と拡張性を高める-
kenichirokimura
3
310
Featured
See All Featured
Context Engineering - Making Every Token Count
addyosmani
6
250
Making Projects Easy
brettharned
120
6.4k
Raft: Consensus for Rubyists
vanstee
140
7.1k
Optimising Largest Contentful Paint
csswizardry
37
3.5k
Statistics for Hackers
jakevdp
799
220k
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
danielanewman
230
22k
Facilitating Awesome Meetings
lara
56
6.6k
Practical Tips for Bootstrapping Information Extraction Pipelines
honnibal
PRO
23
1.5k
ピンチをチャンスに:未来をつくるプロダクトロードマップ #pmconf2020
aki_iinuma
127
53k
Typedesign – Prime Four
hannesfritz
42
2.8k
GitHub's CSS Performance
jonrohan
1032
470k
The Art of Programming - Codeland 2020
erikaheidi
56
14k
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