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.3k
個人開発のやっていき方
r7kamura
94
23k
amakanにおける書籍のシリーズ判定方法について 2016-08-21
r7kamura
10
5.9k
Tenkaichi Bot Butoukai
r7kamura
11
5k
Paging in API
r7kamura
3
8.5k
Chanko Hacking Guide
r7kamura
5
1.2k
Making things with something small
r7kamura
1
450
Hidden
r7kamura
0
63
Butsukari Geiko
r7kamura
9
36k
Other Decks in Programming
See All in Programming
CSC307 Lecture 05
javiergs
PRO
0
210
3 Effective Rules for Success with Signals in Angular
manfredsteyer
PRO
0
120
CSC307 Lecture 09
javiergs
PRO
1
500
Javaの現状2024夏 / Java current status 2024 summer
kishida
4
1.4k
Prompt FlowによるLLMアプリケーション開発
yuto2000
1
1k
みんなのオブザーバビリティプラットフォームを作ってるんだがパフォーマンスがやばい #mackerelio #srenext
ne_sachirou
0
370
CSC307 Lecture 13
javiergs
PRO
0
150
君たちはどうコードをレビューする (される) か / 大吉祥寺.pm
utgwkk
15
8.5k
Findy - エンジニア向け会社紹介 / Findy Letter for Engineers
findyinc
2
81k
コード生成を伴うLLMエージェント - 2024.07.18 Tokyo AI
smiyawaki0820
11
4.1k
Jetpack for KMP
fornewid
1
290
入社1ヶ月でここまでやった!Findy Toolsインフラ支援の最適化
rvirus0817
6
1.4k
Featured
See All Featured
Code Review Best Practice
trishagee
58
16k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
129
32k
The Illustrated Children's Guide to Kubernetes
chrisshort
39
47k
Testing 201, or: Great Expectations
jmmastey
33
6.9k
Easily Structure & Communicate Ideas using Wireframe
afnizarnur
189
16k
Designing on Purpose - Digital PM Summit 2013
jponch
113
6.6k
StorybookのUI Testing Handbookを読んだ
zakiyama
15
4.9k
A Tale of Four Properties
chriscoyier
155
22k
Navigating Team Friction
lara
181
13k
Fontdeck: Realign not Redesign
paulrobertlloyd
79
5.1k
Designing the Hi-DPI Web
ddemaree
276
34k
GraphQLとの向き合い方2022年版
quramy
36
13k
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