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.6k
個人開発のやっていき方
r7kamura
94
23k
amakanにおける書籍のシリーズ判定方法について 2016-08-21
r7kamura
10
6.1k
Tenkaichi Bot Butoukai
r7kamura
11
5.2k
Paging in API
r7kamura
3
8.6k
Chanko Hacking Guide
r7kamura
5
1.3k
Making things with something small
r7kamura
1
470
Hidden
r7kamura
0
87
Butsukari Geiko
r7kamura
10
36k
Other Decks in Programming
See All in Programming
ComposeでWebアプリを作る技術
tbsten
0
110
Agentic Applications with Symfony
el_stoffel
2
280
データベースエンジニアの仕事を楽にする。PgAssistantの紹介
nnaka2992
9
4.5k
Optimizing JRuby 10
headius
0
270
Enterprise Web App. Development (1): Build Tool Training Ver. 5
knakagawa
1
110
SEAL - Dive into the sea of search engines - Symfony Live Berlin 2025
alexanderschranz
1
130
DataStoreをテストする
mkeeda
0
290
API for docs
soutaro
2
1.2k
PHP で学ぶ OAuth 入門
azuki
1
180
Coding Experience Cpp vs Csharp - meetup app osaka@9
harukasao
0
740
5年間継続して開発した自作OSSの記録
bebeji_nappa
0
190
Being an ethical software engineer
xgouchet
PRO
0
210
Featured
See All Featured
We Have a Design System, Now What?
morganepeng
52
7.5k
個人開発の失敗を避けるイケてる考え方 / tips for indie hackers
panda_program
104
19k
Code Reviewing Like a Champion
maltzj
522
40k
The Success of Rails: Ensuring Growth for the Next 100 Years
eileencodes
45
7.2k
Building a Modern Day E-commerce SEO Strategy
aleyda
40
7.2k
Being A Developer After 40
akosma
91
590k
No one is an island. Learnings from fostering a developers community.
thoeni
21
3.2k
Mobile First: as difficult as doing things right
swwweet
223
9.6k
How to Create Impact in a Changing Tech Landscape [PerfNow 2023]
tammyeverts
52
2.4k
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
34
2.2k
Thoughts on Productivity
jonyablonski
69
4.6k
Music & Morning Musume
bryan
47
6.5k
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 = r7kamura@gmail.com
thanks! ✘ ╹◡╹ ✘ @r7kamura