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 workflow
Search
r7kamura
July 26, 2012
Programming
28
5.5k
Git workflow
r7kamura
July 26, 2012
Tweet
Share
More Decks by r7kamura
See All by r7kamura
Railsアップグレード百景
r7kamura
11
6.7k
個人開発のやっていき方
r7kamura
94
23k
amakanにおける書籍のシリーズ判定方法について 2016-08-21
r7kamura
10
6.1k
Tenkaichi Bot Butoukai
r7kamura
11
5.2k
Paging in API
r7kamura
3
8.7k
Chanko Hacking Guide
r7kamura
5
1.3k
Making things with something small
r7kamura
1
480
Hidden
r7kamura
0
94
Butsukari Geiko
r7kamura
10
36k
Other Decks in Programming
See All in Programming
Advanced Micro Frontends: Multi Version/ Framework Scenarios @WAD 2025, Berlin
manfredsteyer
PRO
0
280
The Modern View Layer Rails Deserves: A Vision For 2025 And Beyond @ RailsConf 2025, Philadelphia, PA
marcoroth
2
510
ふつうの技術スタックでアート作品を作ってみる
akira888
1
900
Result型で“失敗”を型にするPHPコードの書き方
kajitack
5
930
LT 2025-06-30: プロダクトエンジニアの役割
yamamotok
0
790
코딩 에이전트 체크리스트: Claude Code ver.
nacyot
0
690
iOS 26にアップデートすると実機でのHot Reloadができない?
umigishiaoi
0
130
#kanrk08 / 公開版 PicoRubyとマイコンでの自作トレーニング計測装置を用いたワークアウトの理想と現実
bash0c7
1
790
AIエージェントはこう育てる - GitHub Copilot Agentとチームの共進化サイクル
koboriakira
0
600
脱Riverpod?fqueryで考える、TanStack Queryライクなアーキテクチャの可能性
ostk0069
0
260
Google Agent Development Kit でLINE Botを作ってみた
ymd65536
2
260
Agentic Coding: The Future of Software Development with Agents
mitsuhiko
0
110
Featured
See All Featured
Imperfection Machines: The Place of Print at Facebook
scottboms
267
13k
Save Time (by Creating Custom Rails Generators)
garrettdimon
PRO
31
1.3k
Helping Users Find Their Own Way: Creating Modern Search Experiences
danielanewman
29
2.7k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
35
2.4k
Code Review Best Practice
trishagee
69
19k
YesSQL, Process and Tooling at Scale
rocio
173
14k
Side Projects
sachag
455
42k
Practical Tips for Bootstrapping Information Extraction Pipelines
honnibal
PRO
20
1.3k
Become a Pro
speakerdeck
PRO
29
5.4k
The Invisible Side of Design
smashingmag
301
51k
Practical Orchestrator
shlominoach
189
11k
Scaling GitHub
holman
460
140k
Transcript
Git workflow by @r7kamura
workflow
checkout -b feature commit rebase commit rebase commit merge master
feature
checkout commit -m “add foo” rebase commit rebase commit merge
master feature
checkout commit rebase master commit rebase commit merge master feature
checkout commit rebase commit -m “add bar” rebase commit merge
master feature
checkout commit rebase commit rebase master commit merge master feature
checkout commit rebase commit rebase commit -m “add baz” merge
master feature
checkout commit rebase commit rebase commit merge feature --no-ff master
feature
checkout commit rebase commit rebase commit merge feature --no-ff master
feature push ghe feature Use merge button on GHE
tips
$ git config push.default tracking $ git push -u origin
feature $ git push tips 1: git push without args
$ git config push.default current $ git push tips 1:
git push without args
tips 2: tig
tips 3: .tigrc # .tigrc - thanks to kyanny-san bind
main o !@hub browse -- commit/%(commit) bind diff o !@hub browse -- commit/%(commit) bind log o !@hub browse -- commit/%(commit) Press “O” to browse the commit in github
tips 4: git blame with editor
tips 5: show current branch show current branch by tmux-powerline
tips 6: partial config file # ~/.gitconfig [include] path =
.gitconfig.local # ~/.gitconfig.local [user] email =
[email protected]
thanks! ✘ ╹◡╹ ✘ @r7kamura