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
Sponsored
·
Your Podcast. Everywhere. Effortlessly.
Share. Educate. Inspire. Entertain. You do you. We'll handle the rest.
→
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
410
Comment Docker révolutionne le web
ubermuda
3
700
Vers des applications twelve-factor
ubermuda
2
1.1k
Git et la théorie des graph
ubermuda
3
1.1k
Introduction à Docker
ubermuda
6
1.1k
Meetup Docker 101
ubermuda
1
220
A multi-container Symfony2 setup with Docker
ubermuda
40
12k
Docker Introduction
ubermuda
5
510
Symfony 2, un framework robuste et moderne
ubermuda
5
200
Other Decks in Technology
See All in Technology
顧客の言葉を、そのまま信じない勇気
yamatai1212
1
350
ClickHouseはどのように大規模データを活用したAIエージェントを全社展開しているのか
mikimatsumoto
0
220
SREのプラクティスを用いた3領域同時 マネジメントへの挑戦 〜SRE・情シス・セキュリティを統合した チーム運営術〜
coconala_engineer
2
640
MCPでつなぐElasticsearchとLLM - 深夜の障害対応を楽にしたい / Bridging Elasticsearch and LLMs with MCP
sashimimochi
0
160
Bedrock PolicyでAmazon Bedrock Guardrails利用を強制してみた
yuu551
0
210
学生・新卒・ジュニアから目指すSRE
hiroyaonoe
2
590
Amazon S3 Vectorsを使って資格勉強用AIエージェントを構築してみた
usanchuu
3
450
外部キー制約の知っておいて欲しいこと - RDBMSを正しく使うために必要なこと / FOREIGN KEY Night
soudai
PRO
12
5.3k
[CV勉強会@関東 World Model 読み会] Orbis: Overcoming Challenges of Long-Horizon Prediction in Driving World Models (Mousakhan+, NeurIPS 2025)
abemii
0
130
10Xにおける品質保証活動の全体像と改善 #no_more_wait_for_test
nihonbuson
PRO
2
230
Amazon Bedrock Knowledge Basesチャンキング解説!
aoinoguchi
0
130
コスト削減から「セキュリティと利便性」を担うプラットフォームへ
sansantech
PRO
3
1.4k
Featured
See All Featured
Self-Hosted WebAssembly Runtime for Runtime-Neutral Checkpoint/Restore in Edge–Cloud Continuum
chikuwait
0
320
Joys of Absence: A Defence of Solitary Play
codingconduct
1
290
10 Git Anti Patterns You Should be Aware of
lemiorhan
PRO
659
61k
How to make the Groovebox
asonas
2
1.9k
The Invisible Side of Design
smashingmag
302
51k
Context Engineering - Making Every Token Count
addyosmani
9
650
How to Grow Your eCommerce with AI & Automation
katarinadahlin
PRO
0
110
Designing Dashboards & Data Visualisations in Web Apps
destraynor
231
54k
Typedesign – Prime Four
hannesfritz
42
2.9k
Code Review Best Practice
trishagee
74
20k
Why Your Marketing Sucks and What You Can Do About It - Sophie Logan
marketingsoph
0
73
Reflections from 52 weeks, 52 projects
jeffersonlam
356
21k
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