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.4k
個人開発のやっていき方
r7kamura
94
23k
amakanにおける書籍のシリーズ判定方法について 2016-08-21
r7kamura
10
5.9k
Tenkaichi Bot Butoukai
r7kamura
11
5.1k
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
70
Butsukari Geiko
r7kamura
9
36k
Other Decks in Programming
See All in Programming
The Sequel to a Dream of Ruby Parser's Grammar
ydah
1
220
Jakarta EE meets AI
ivargrimstad
0
370
What is Parser
yui_knk
9
4.1k
rails_girls_is_my_gate_to_join_the_ruby_commuinty
maimux2x
0
190
メモリ最適化を究める!iOSアプリ開発における5つの重要なポイント
yhirakawa333
0
410
Amebaチョイス立ち上げの裏側 ~依存システムとの闘い~
daichi_igarashi
0
230
Scala におけるコンパイラエラーとの付き合い方
chencmd
2
410
GraphQLの魅力を引き出すAndroidクライアント実装
morux2
3
340
実践 Advanced CallKit 〜快適な通話の実現に向けて〜
mot_techtalk
3
130
Kotlin 2.0 and Beyond
antonarhipov
2
150
XStateでReactに秩序を与えたい
gizm000
0
720
ドメイン駆動設計を実践するために必要なもの
bikisuke
3
330
Featured
See All Featured
ピンチをチャンスに:未来をつくるプロダクトロードマップ #pmconf2020
aki_iinuma
103
48k
The Invisible Customer
myddelton
119
13k
Ruby is Unlike a Banana
tanoku
96
11k
Design by the Numbers
sachag
277
19k
10 Git Anti Patterns You Should be Aware of
lemiorhan
653
58k
StorybookのUI Testing Handbookを読んだ
zakiyama
26
5.1k
Intergalactic Javascript Robots from Outer Space
tanoku
268
26k
Statistics for Hackers
jakevdp
793
220k
Git: the NoSQL Database
bkeepers
PRO
425
64k
Clear Off the Table
cherdarchuk
91
320k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
166
48k
Designing for humans not robots
tammielis
248
25k
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