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
6k
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
460
Hidden
r7kamura
0
78
Butsukari Geiko
r7kamura
10
36k
Other Decks in Programming
See All in Programming
Honoをフロントエンドで使う 3つのやり方
yusukebe
7
3.3k
Honoとフロントエンドの 型安全性について
yodaka
7
1.2k
仕様変更に耐えるための"今の"DRY原則を考える / Rethinking the "Don't repeat yourself" for resilience to specification changes
mkmk884
0
160
Grafana Loki によるサーバログのコスト削減
mot_techtalk
1
130
クリーンアーキテクチャから見る依存の向きの大切さ
shimabox
2
290
楽しく向き合う例外対応
okutsu
0
110
XStateを用いた堅牢なReact Components設計~複雑なClient Stateをシンプルに~ @React Tokyo ミートアップ #2
kfurusho
1
900
Pythonでもちょっとリッチな見た目のアプリを設計してみる
ueponx
1
560
Kubernetes History Inspector(KHI)を触ってみた
bells17
0
230
sappoRo.R #12 初心者セッション
kosugitti
0
250
Bedrock Agentsレスポンス解析によるAgentのOps
licux
3
840
ARA Ansible for the teams
kksat
0
150
Featured
See All Featured
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
33
2.1k
Measuring & Analyzing Core Web Vitals
bluesmoon
6
240
Fontdeck: Realign not Redesign
paulrobertlloyd
83
5.4k
Bootstrapping a Software Product
garrettdimon
PRO
306
110k
Producing Creativity
orderedlist
PRO
344
39k
Designing on Purpose - Digital PM Summit 2013
jponch
117
7.1k
How GitHub (no longer) Works
holman
314
140k
Build The Right Thing And Hit Your Dates
maggiecrowley
34
2.5k
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
330
21k
Responsive Adventures: Dirty Tricks From The Dark Corners of Front-End
smashingmag
251
21k
Creating an realtime collaboration tool: Agile Flush - .NET Oxford
marcduiker
27
1.9k
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
356
29k
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