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
180
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
350
Comment Docker révolutionne le web
ubermuda
3
660
Vers des applications twelve-factor
ubermuda
2
880
Git et la théorie des graph
ubermuda
3
900
Introduction à Docker
ubermuda
6
910
Meetup Docker 101
ubermuda
1
190
A multi-container Symfony2 setup with Docker
ubermuda
40
12k
Docker Introduction
ubermuda
5
400
Symfony 2, un framework robuste et moderne
ubermuda
5
160
Other Decks in Technology
See All in Technology
Java EE/Jakarta EEの現状と将来―クラウドネイティブ時代にJava EEは対応できるのか?―
takakiyo
1
140
DevOpsメトリクスとアウトカムの接続にトライ!開発プロセスを通して計測できるメトリクスの活用方法
ham0215
2
230
TechFeed Experts Night#27 〜 フロントエンドフレームワーク最前線 (Svelte)
baseballyama
1
410
開発生産性向上サービスを作るFindyが自分たちで開発生産性を爆上げした組織づくりの歩み / Findy's path to boosting its own development productivity 2024-04-17
ma3tk
3
640
ExaDB-D dbaascli で出来ること
oracle4engineer
PRO
0
2.1k
Azureの基本的な権限管理の勉強会
yhana
0
180
VSCodeの拡張機能を作っている話
ebarakazuhiro
1
340
長期間TiDBを使ってきた話 @ 私たちはなぜNewSQLを使うのかTiDB選定5社が語る選定理由と活用LT / Experiences with TiDB Over Time
chibiegg
2
890
Hands-on Gemini, the Google DeepMind LLM
meteatamel
1
110
JAWS-UG Bedrock Claude Night
yamahiro
3
570
生産性向上チームの紹介
cybozuinsideout
PRO
1
870
KubeConにproposalを送りたい人へのアドバイス
sat
PRO
3
240
Featured
See All Featured
How to train your dragon (web standard)
notwaldorf
73
5.2k
Writing Fast Ruby
sferik
621
60k
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
227
16k
How STYLIGHT went responsive
nonsquared
92
4.8k
How to Ace a Technical Interview
jacobian
272
22k
The Power of CSS Pseudo Elements
geoffreycrofte
60
5k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
274
13k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
19
1.7k
Gamification - CAS2011
davidbonilla
76
4.6k
What's new in Ruby 2.0
geeforr
337
31k
The Illustrated Children's Guide to Kubernetes
chrisshort
31
46k
Docker and Python
trallard
34
2.7k
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