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
Search
Sponsored
·
SiteGround - Reliable hosting with speed, security, and support you can count on.
→
sjonnet
May 15, 2019
Technology
0
68
Git
sjonnet
May 15, 2019
Tweet
Share
More Decks by sjonnet
See All by sjonnet
Testing
sjonnet
1
84
Services
sjonnet
1
78
Pollyfills
sjonnet
1
78
MVC
sjonnet
4
210
extCSS
sjonnet
1
100
Error
sjonnet
1
68
Other Decks in Technology
See All in Technology
30万人の同時アクセスに耐えたい!新サービスの盤石なリリースを支える負荷試験 / SRE Kaigi 2026
genda
3
1k
なぜ今、コスト最適化(倹約)が必要なのか? ~AWSでのコスト最適化の進め方「目的編」~
htan
1
110
コスト削減から「セキュリティと利便性」を担うプラットフォームへ
sansantech
PRO
3
1.4k
Codex 5.3 と Opus 4.6 にコーポレートサイトを作らせてみた / Codex 5.3 vs Opus 4.6
ama_ch
0
100
会社紹介資料 / Sansan Company Profile
sansan33
PRO
15
400k
20260204_Midosuji_Tech
takuyay0ne
1
140
Digitization部 紹介資料
sansan33
PRO
1
6.8k
日本の85%が使う公共SaaSは、どう育ったのか
taketakekaho
1
140
Oracle Cloud Observability and Management Platform - OCI 運用監視サービス概要 -
oracle4engineer
PRO
2
14k
予期せぬコストの急増を障害のように扱う――「コスト版ポストモーテム」の導入とその後の改善
muziyoshiz
1
1.7k
Data Hubグループ 紹介資料
sansan33
PRO
0
2.7k
Contract One Engineering Unit 紹介資料
sansan33
PRO
0
13k
Featured
See All Featured
Java REST API Framework Comparison - PWX 2021
mraible
34
9.1k
Making Projects Easy
brettharned
120
6.6k
Tell your own story through comics
letsgokoyo
1
810
Scaling GitHub
holman
464
140k
How to Talk to Developers About Accessibility
jct
2
130
Navigating Algorithm Shifts & AI Overviews - #SMXNext
aleyda
0
1.1k
The AI Revolution Will Not Be Monopolized: How open-source beats economies of scale, even for LLMs
inesmontani
PRO
3
3k
The untapped power of vector embeddings
frankvandijk
1
1.6k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
141
34k
SEO for Brand Visibility & Recognition
aleyda
0
4.2k
Lessons Learnt from Crawling 1000+ Websites
charlesmeaden
PRO
1
1.1k
Building a Scalable Design System with Sketch
lauravandoore
463
34k
Transcript
Git Fork, Branch, Rebase, Squash and Flow oh my Shawn
Jonnet <
[email protected]
>
Overview • Fork and Branch • Rebase • Squash •
Flow
Fork and Branch • Forking is useful for creating a
repository to maintain branches that you don't want or are not yet ready to share. • Branching for feature and bug fixing helps keep work isolated from more stable branches and allows the developer to commit often and push often.
git checkout -b feature/<feature>
Rebase • Rebase was designed to specifically help with the
sequence of code commits and progress. Have you looked at your commit history?
git rebase master
Squash • Squash? Wait what this is intended to create
clean commit's so it makes code reviews easier.
git reset HEAD~[1-9*] && git add . && git commit
-m 'Clean commit'
Flow • Release • Hotfix • Feature
git flow feature (start|finish) 0.0.1
git flow release (start|finish) 0.0.1
git flow hotfix (start|finish) 0.0.1