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
91
Butsukari Geiko
r7kamura
10
36k
Other Decks in Programming
See All in Programming
Doma で目指す ORM 最適解
nakamura_to
1
160
Rethinking Data Access: The New httpResource in Angular
manfredsteyer
PRO
0
210
iOSアプリ開発もLLMで自動運転する
hiragram
6
2.1k
型安全なDrag and Dropの設計を考える
yudppp
5
660
鯛変だったRubyKaigi 2025 ── それでも楽しかった!
pndcat
0
130
SpringBootにおけるオブザーバビリティのなにか
irof
1
880
ソフトウェア品質特性、意識してますか?AIの真の力を引き出す活用事例 / ai-and-software-quality
minodriven
19
6.6k
Parallel::Pipesの紹介
skaji
2
860
バリデーションライブラリ徹底比較
nayuta999999
1
420
REST API設計の実践 – ベストプラクティスとその落とし穴
kentaroutakeda
2
310
Practical Domain-Driven Design - Workshop at NDC 2025
mufrid
0
130
『Python → TypeScript』オンボーディング奮闘記
takumi_tatsuno
1
130
Featured
See All Featured
Into the Great Unknown - MozCon
thekraken
39
1.8k
Building Adaptive Systems
keathley
41
2.6k
Agile that works and the tools we love
rasmusluckow
329
21k
Measuring & Analyzing Core Web Vitals
bluesmoon
7
460
The Invisible Side of Design
smashingmag
299
50k
Writing Fast Ruby
sferik
628
61k
The World Runs on Bad Software
bkeepers
PRO
68
11k
Documentation Writing (for coders)
carmenintech
71
4.8k
Build The Right Thing And Hit Your Dates
maggiecrowley
35
2.7k
Become a Pro
speakerdeck
PRO
28
5.4k
How to Ace a Technical Interview
jacobian
276
23k
Bootstrapping a Software Product
garrettdimon
PRO
307
110k
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