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.2k
個人開発のやっていき方
r7kamura
94
22k
amakanにおける書籍のシリーズ判定方法について 2016-08-21
r7kamura
10
5.8k
Tenkaichi Bot Butoukai
r7kamura
11
5k
Paging in API
r7kamura
3
8.4k
Chanko Hacking Guide
r7kamura
5
1.2k
Making things with something small
r7kamura
1
440
Hidden
r7kamura
0
56
Butsukari Geiko
r7kamura
9
36k
Other Decks in Programming
See All in Programming
ペパボOpenTelemetry革命
pyama86
2
1.1k
Prepare for Jakarta EE 11 - Performance and Developer Productivity
ivargrimstad
0
260
Next.js App Router
quramy
14
2.3k
GoでParserを書く
karupanerura
3
340
“Seeing Like a Programmer”—Resiliency, Limits, and Moral Hazards in Software Engineering (LambdaConf 2024)
chriskrycho
0
430
Revisiting the Hotwire Landscape after Turbo 8 @ RailsConf 2024, Detroit
marcoroth
3
610
An adventure of Happy Eyeballs
coe401_
1
140
Runtime Objects in Rust
mitsuhiko
0
220
FoodGram
iseruuuuu
0
230
Productivity is Messing Around and Having Fun
hollycummins
1
180
Amazon Aurora Serverless v2が意外と高かった話と、AWS Database Migration Serviceの話
satoshi256kbyte
1
110
『Railsオワコン』と言われる時代に、なぜブルーモ証券はRailsを選ぶのか
free_world21
2
480
Featured
See All Featured
Fashionably flexible responsive web design (full day workshop)
malarkey
398
65k
Building Adaptive Systems
keathley
32
1.9k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
morganepeng
117
18k
Automating Front-end Workflow
addyosmani
1357
200k
The Language of Interfaces
destraynor
151
23k
What's in a price? How to price your products and services
michaelherold
238
11k
Creatively Recalculating Your Daily Design Routine
revolveconf
211
11k
Building a Scalable Design System with Sketch
lauravandoore
457
32k
Producing Creativity
orderedlist
PRO
338
39k
A Modern Web Designer's Workflow
chriscoyier
689
190k
The Straight Up "How To Draw Better" Workshop
denniskardys
228
130k
Typedesign – Prime Four
hannesfritz
36
2.1k
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