Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Speaker Deck
PRO
Sign in
Sign up for free
Git, Unicorns and Rainbows
ubermuda
October 27, 2011
Technology
3
140
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
280
Comment Docker révolutionne le web
ubermuda
3
610
Vers des applications twelve-factor
ubermuda
2
700
Git et la théorie des graph
ubermuda
3
820
Introduction à Docker
ubermuda
6
760
Meetup Docker 101
ubermuda
1
180
A multi-container Symfony2 setup with Docker
ubermuda
40
12k
Docker Introduction
ubermuda
5
360
Symfony 2, un framework robuste et moderne
ubermuda
5
160
Other Decks in Technology
See All in Technology
Salesforce女子部-権限についてまとめてみたその1
sfggjp
0
180
プロダクトグロースと技術のベースアップを両立させるRettyのアプリ開発スタイル / Achieve Product Growth and Tech Update
imaizume
1
260
msal.jsのあれこれ
takas0522
0
1.4k
Power BI ”を” 可視化しよう!
hanaseleb
0
140
技術広報の役割を定義してみた 2022年春
afroscript
3
2.3k
Learning from AWS Customer Security Incidents [2022]
ramimac
0
450
モデリング、コンテキスト トランジション +1 / Data modeling
ishiayaya
0
110
⚡Lightdashを試してみた
k_data_analyst
0
130
220428event_ogura_part
caddi_eng
0
180
一人から始めるプロダクトSRE / How to start SRE in a product team, all by yourself
vtryo
4
2.3k
#BabylonJS5 の祭ツイートまとめ Let's take a look at what people create with the latest #BabylonJS5
chomado
0
600
Building smarter apps with machine learning, from magic to reality
picardparis
4
3.1k
Featured
See All Featured
Designing for Performance
lara
596
63k
It's Worth the Effort
3n
172
25k
The Art of Programming - Codeland 2020
erikaheidi
31
5.8k
What the flash - Photography Introduction
edds
61
9.8k
Optimizing for Happiness
mojombo
365
63k
Designing Experiences People Love
moore
130
22k
What's in a price? How to price your products and services
michaelherold
229
9.3k
We Have a Design System, Now What?
morganepeng
35
2.9k
10 Git Anti Patterns You Should be Aware of
lemiorhan
638
52k
Let's Do A Bunch of Simple Stuff to Make Websites Faster
chriscoyier
498
130k
Rebuilding a faster, lazier Slack
samanthasiow
62
7.2k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
119
28k
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