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
ローカルLLMとLINE Botの組み合わせ その2(EVO-X2でgpt-oss-120bを利用) / LINE DC Generative AI Meetup #7
you
PRO
1
150
Building a cloud native business on open source
lizrice
0
170
OCIjp_Oracle AI World_Recap
shinpy
1
170
IoTLT@ストラタシスジャパン_20251021
norioikedo
0
100
デザインとエンジニアリングの架け橋を目指す OPTiMのデザインシステム「nucleus」の軌跡と広げ方
optim
0
100
webpack依存からの脱却!快適フロントエンド開発をViteで実現する #vuefes
bengo4com
3
3.2k
CNCFの視点で捉えるPlatform Engineering - 最新動向と展望 / Platform Engineering from the CNCF Perspective
hhiroshell
0
140
Azureコストと向き合った、4年半のリアル / Four and a half years of dealing with Azure costs
aeonpeople
1
280
現場データから見える、開発生産性の変化コード生成AI導入・運用のリアル〜 / Changes in Development Productivity and Operational Challenges Following the Introduction of Code Generation AI
nttcom
1
460
様々なファイルシステム
sat
PRO
0
240
ViteとTypeScriptのProject Referencesで 大規模モノレポのUIカタログのリリースサイクルを高速化する
shuta13
3
190
事業開発におけるDify活用事例
kentarofujii
5
1.4k
Featured
See All Featured
Connecting the Dots Between Site Speed, User Experience & Your Business [WebExpo 2025]
tammyeverts
10
610
Testing 201, or: Great Expectations
jmmastey
45
7.7k
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
359
30k
Building Adaptive Systems
keathley
44
2.8k
Refactoring Trust on Your Teams (GOTO; Chicago 2020)
rmw
35
3.2k
KATA
mclloyd
PRO
32
15k
Principles of Awesome APIs and How to Build Them.
keavy
127
17k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
140
34k
Helping Users Find Their Own Way: Creating Modern Search Experiences
danielanewman
30
2.9k
Thoughts on Productivity
jonyablonski
70
4.9k
Building an army of robots
kneath
305
46k
VelocityConf: Rendering Performance Case Studies
addyosmani
333
24k
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