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
Prompt Cachingは本当に効果的なのか検証してみた.pdf
ttnyt8701
0
530
実践!難読化ガイド
mitchan
0
120
Our Websites Need a Lifestyle Change, Not a Diet
ryantownsend
0
130
マイグレーションコード自作して File-Based Routing に自動移行!! ~250 ページの歴史的経緯を添えて~
cut0
1
260
The Shape of a Service Object
inem
0
490
Rustではじめる負荷試験
skanehira
5
1.2k
メモリ最適化を究める!iOSアプリ開発における5つの重要なポイント
yhirakawa333
0
410
Web技術を駆使してユーザーの画面を「録画」する
yukukotani
13
6.5k
dotfiles について話したい #湘なんか
stefafafan
2
300
Amazon BedrockでサーバレスなAIお料理ボットを作成する!!
tosuri13
0
200
Boost Performance and Developer Productivity with Jakarta EE 11
ivargrimstad
0
320
What you can do with Ruby on WebAssembly
kateinoigakukun
0
160
Featured
See All Featured
Become a Pro
speakerdeck
PRO
22
4.9k
The Mythical Team-Month
searls
218
43k
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
45
4.8k
Building Applications with DynamoDB
mza
90
6k
Mobile First: as difficult as doing things right
swwweet
221
8.8k
Why You Should Never Use an ORM
jnunemaker
PRO
53
8.9k
No one is an island. Learnings from fostering a developers community.
thoeni
18
2.9k
BBQ
matthewcrist
83
9.1k
10 Git Anti Patterns You Should be Aware of
lemiorhan
653
58k
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
326
21k
Large-scale JavaScript Application Architecture
addyosmani
508
110k
Creatively Recalculating Your Daily Design Routine
revolveconf
215
12k
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