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
Faces do Git que você não conhece
Search
Cesar Kawakami
May 13, 2015
Programming
0
63
Faces do Git que você não conhece
Talk sobre Git @ Geekie HQ, 13 de maio de 2015.
Cesar Kawakami
May 13, 2015
Tweet
Share
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
92
Economizando servidores e acelerando aplicações web com Gevent e programação concorrente
cesarkawakami
0
300
pybr2013-lightning-traps
cesarkawakami
0
130
pythonbrasil2013
cesarkawakami
4
730
Other Decks in Programming
See All in Programming
なぜあの開発者はDevRelに伴走し続けるのか / Why Does That Developer Keep Running Alongside DevRel?
nrslib
2
360
非同期jobをtransaction内で 呼ぶなよ!絶対に呼ぶなよ!
alstrocrack
0
490
Go Conference 2025: Goで体感するMultipath TCP ― Go 1.24 時代の MPTCP Listener を理解する
takehaya
7
1.5k
Introducing ReActionView: A new ActionView-Compatible ERB Engine @ Kaigi on Rails 2025, Tokyo, Japan
marcoroth
3
890
Web Components で実現する Hotwire とフロントエンドフレームワークの橋渡し / Bridging with Web Components
da1chi
3
1.5k
Advance Your Career with Open Source
ivargrimstad
0
270
開発者への寄付をアプリ内課金として実装する時の気の使いどころ
ski
0
340
AI Coding Meetup #3 - 導入セッション / ai-coding-meetup-3
izumin5210
0
360
CSC509 Lecture 03
javiergs
PRO
0
320
iOSDC.pdf
chronos2500
2
650
CSC509 Lecture 02
javiergs
PRO
0
400
プログラミングどうやる? ~テスト駆動開発から学ぶ達人の型~
a_okui
0
190
Featured
See All Featured
Easily Structure & Communicate Ideas using Wireframe
afnizarnur
194
16k
How To Stay Up To Date on Web Technology
chriscoyier
791
250k
Keith and Marios Guide to Fast Websites
keithpitt
411
22k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
285
14k
Making Projects Easy
brettharned
118
6.4k
It's Worth the Effort
3n
187
28k
The Cost Of JavaScript in 2023
addyosmani
53
9k
Helping Users Find Their Own Way: Creating Modern Search Experiences
danielanewman
30
2.9k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
morganepeng
132
19k
Statistics for Hackers
jakevdp
799
220k
Measuring & Analyzing Core Web Vitals
bluesmoon
9
610
Principles of Awesome APIs and How to Build Them.
keavy
127
17k
Transcript
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