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
プロダクト志向ってなんなんだろうね
righttouch
PRO
0
180
Code as Context 〜 1にコードで 2にリンタ 34がなくて 5にルール? 〜
yodakeisuke
0
120
第9回 情シス転職ミートアップ 株式会社IVRy(アイブリー)の紹介
ivry_presentationmaterials
1
280
PHP 8.4の新機能「プロパティフック」から学ぶオブジェクト指向設計とリスコフの置換原則
kentaroutakeda
2
750
Modern Angular with Signals and Signal Store:New Rules for Your Architecture @enterJS Advanced Angular Day 2025
manfredsteyer
PRO
0
210
レベル1の開発生産性向上に取り組む − 日々の作業の効率化・自動化を通じた改善活動
kesoji
0
120
スタートアップの急成長を支えるプラットフォームエンジニアリングと組織戦略
sutochin26
1
4.7k
Google Agent Development Kit でLINE Botを作ってみた
ymd65536
2
230
RailsGirls IZUMO スポンサーLT
16bitidol
0
170
なぜ適用するか、移行して理解するClean Architecture 〜構造を超えて設計を継承する〜 / Why Apply, Migrate and Understand Clean Architecture - Inherit Design Beyond Structure
seike460
PRO
3
750
チームで開発し事業を加速するための"良い"設計の考え方 @ サポーターズCoLab 2025-07-08
agatan
1
320
git worktree × Claude Code × MCP ~生成AI時代の並列開発フロー~
hisuzuya
1
550
Featured
See All Featured
Visualization
eitanlees
146
16k
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
irinanazarova
8
810
The Invisible Side of Design
smashingmag
301
51k
Testing 201, or: Great Expectations
jmmastey
42
7.6k
BBQ
matthewcrist
89
9.7k
4 Signs Your Business is Dying
shpigford
184
22k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
eileencodes
26
2.9k
Bootstrapping a Software Product
garrettdimon
PRO
307
110k
Practical Orchestrator
shlominoach
188
11k
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
48
5.4k
GraphQLとの向き合い方2022年版
quramy
49
14k
Music & Morning Musume
bryan
46
6.6k
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