Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Sign up for free
Menu
Search
Features
All features
Private URLs
Password Protection
Custom URLS
Scheduled publishing
Remove Branding
Restrict embedding
Deck Collections
Notes
Features
All features
Private URLs
Password Protection
Custom URLS
Scheduled publishing
Remove Branding
Restrict embedding
Deck Collections
Notes
Explore
Featured decks
Featured speakers
Programming
Technology
Storyboards
Explore
Featured decks
Featured speakers
Programming
Technology
Storyboards
Pricing
Search
Sign in
Sign up for free
Faces do Git que você não conhece
Search
Cesar Kawakami
May 13, 2015
Programming
80
0
Share
Embed
Copy iframe code
Copy JS code
Copy link
Start on current slide
Faces do Git que você não conhece
Talk sobre Git @ Geekie HQ, 13 de maio de 2015.
Cesar Kawakami
May 13, 2015
Transcript
27 slides
Faces do Git que você não conhece Cesar Kawakami
Tópicos • Fiz cagada: como desfazer? • Explique-me submodules! •
Merge conflicts: como não se embananar? • Truques de performance • Projeto “pusher” • Code Review
Desfazendo cagadas
Desfazendo cagadas • Onde você está? • git status •
git merge, git rebase, git cherry-pick, git revert, git bisect…
None
Desfazendo cagadas • Aaah! Dei commit --amend sem querer! •
git rebase • git reset --soft
Desfazendo cagadas • Aaah! Esqueci de splittar o commit! •
git add -p
Desfazendo cagadas • Aaah! Deletei a última branch/tag que apontava
pro commit! • git fsck --lost-found • git reflog
Desfazendo cagadas • Aaah, fiz merge ao invés de rebase!
• git merge --squash
Desfazendo cagadas • In general… • git rebase • git
reset
Submodules
Submodules • Projetos externos no mesmo repo • “ponteiro” para
um sha-1 no subrepo
Submodules • vs subtrees?
Submodules • git submodule update --init --recursive • git submodule
sync --recursive
Merge conflicts
Merge conflicts
None
Merge conflicts • O importante é o commit final ficar
com o diff que você quer!
Merge conflicts • git rerere
Truques de performance
Truques de performance • Clone!
None
None
Truques de performance • Replace? • http://git-scm.com/blog/2010/03/17/ replace.html • git
filter-branch
Projeto “pusher”
Code Review
Links • .gitconfig do panda https:// dl.dropboxusercontent.com/u/158916053/ gitconfig
More Decks by Cesar Kawakami
See All by Cesar Kawakami
TimeZona: Como manter-se são lidando com tempo e timestamps em aplicações Python
cesarkawakami
0
110
Economizando servidores e acelerando aplicações web com Gevent e programação concorrente
cesarkawakami
0
330
pybr2013-lightning-traps
cesarkawakami
0
160
pythonbrasil2013
cesarkawakami
4
770
Other Decks in Programming
See All in Programming
エージェントの管理もエージェントに – herdr-core と自作バックログで作る司令塔 –
nearme_tech
PRO
1
120
느린 네트워크와 저사양 디바이스 사용자를 위한 웹뷰 로딩 시간 개선기
kmkim
1
270
地方こそサーバーレス — 10年続けた、顔が見えるチームで確かな基盤を / Serverless Matters Most in Regional Areas — 10 Years of Building Reliable Foundations with Close-Knit Teams
seike460
PRO
2
510
The Cost of the DOM
ypresto
2
210
Agentic AI with the Power of Jakarta EE
ivargrimstad
0
190
Beyond Chatbots: Agentic UI with Open Standards @W-JAX 2026, München
manfredsteyer
PRO
0
130
AI時代のFlutter品質設計 — アプリ品質を守るQuality Layers
omatty198
0
390
AI駆動TDD ― 2026年10月版
hrmstrsmgs
0
110
クラウドエージェントは、 何がそんなに便利なのか / what makes cloud agents so useful
rkaga
5
980
선언형 햅틱 라이브러리 진동을 소개합니다
l2hyunwoo
1
330
将来の標準フォーマッター?ktfmtを深堀る
t45k
0
250
Growing PicoRuby's Ecosystem on ESP32
yuuu
2
150
Featured
See All Featured
Jamie Indigo - Trashchat’s Guide to Black Boxes: Technical SEO Tactics for LLMs
techseoconnect
PRO
0
760
Fight the Zombie Pattern Library - RWD Summit 2016
marcelosomers
234
18k
New Earth Scene 8
popppiees
5
2.9k
HU Berlin: Industrial-Strength Natural Language Processing with spaCy and Prodigy
inesmontani
PRO
0
820
SEO for Brand Visibility & Recognition
aleyda
0
4.9k
The Pragmatic Product Professional
lauravandoore
37
7.5k
Designing Dashboards & Data Visualisations in Web Apps
destraynor
232
55k
Building a Modern Day E-commerce SEO Strategy
aleyda
45
9.3k
VelocityConf: Rendering Performance Case Studies
addyosmani
331
25k
Statistics for Hackers
jakevdp
799
230k
The Art of Delivering Value - GDevCon NA Keynote
reverentgeek
16
2.2k
Writing Fast Ruby
sferik
630
63k