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
Sponsored
·
SiteGround - Reliable hosting with speed, security, and support you can count on.
→
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
Agentic AI with the Power of Jakarta EE
ivargrimstad
0
190
Secure Your Coding Agent Like It’s Malware (v1.5) 🇬🇧 @Code.talks 2026
richargh
0
200
あなたはMCPの機能を、まだ知らない。
4geru
1
740
Rails初心者がパスキーを実装してみて大変だったこと
ktombow
0
240
コード生成時代のAPI定義を支えるRequest Spec移行
pvcresin
0
300
Scalaの型でマルチテナントの認可を守る
nextbeatdev
0
180
プロジェクトコードをキレイキレイしよう!暗黙的な参照を読み解く静的解析
ostk0069
0
220
AWS CDKを理解するために公式の定義を深掘って解説してみる / Understanding AWS CDK by Digging into Its Official Definition
akihisaikeda
3
340
TS 7.0 で baseUrl が使えなくなった今、パスエイリアスをどうするか
bicstone
2
810
正解の無い問題を 「できるだけ上手く」解く ヒューリスティックで感性を磨こう。〜現実課題をプログラミングで解きあうコミュニティについて〜
allegrogiken
0
110
Crash Auto Pipelines
veronikapj
1
450
例外からRich Errorsまで Kotlinエラーハンドリングの進化を読み解く
shiita0903
0
240
Featured
See All Featured
Lightning Talk: Beautiful Slides for Beginners
inesmontani
PRO
2
860
Pawsitive SEO: Lessons from My Dog (and Many Mistakes) on Thriving as a Consultant in the Age of AI
davidcarrasco
1
320
Improving Core Web Vitals using Speculation Rules API
sergeychernyshev
21
1.7k
How to Create Impact in a Changing Tech Landscape [PerfNow 2023]
tammyeverts
56
3.5k
How to build a perfect <img>
jonoalderson
1
6.3k
How to build an LLM SEO readiness audit: a practical framework
nmsamuel
2
990
My Coaching Mixtape
mlcsv
0
400
GitHub's CSS Performance
jonrohan
1033
470k
AI: The stuff that nobody shows you
jnunemaker
PRO
12
1.3k
Deep Space Network (abreviated)
tonyrice
0
430
Navigating the Design Leadership Dip - Product Design Week Design Leaders+ Conference 2024
apolaine
2
530
Heart Work Chapter 1 - Part 1
lfama
PRO
11
37k