Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Speaker Deck
PRO
Sign in
Sign up
for free
Git workflow
r7kamura
July 26, 2012
Programming
28
5.4k
Git workflow
r7kamura
July 26, 2012
Tweet
Share
More Decks by r7kamura
See All by r7kamura
r7kamura
10
4.1k
r7kamura
93
21k
r7kamura
10
5.3k
r7kamura
10
4.3k
r7kamura
3
7.8k
r7kamura
5
910
r7kamura
1
350
r7kamura
0
20
r7kamura
9
32k
Other Decks in Programming
See All in Programming
timeseriesfr
0
130
drumato
1
250
kilometer
2
280
manfredsteyer
PRO
2
260
kaz29
2
130
cc4966
1
110
jschaedl
2
110
coe401_
3
170
ganchan11
0
170
naototty
1
110
wafuwafu13
1
170
oracle4engineer
0
150
Featured
See All Featured
pauljervisheath
195
15k
mojombo
359
62k
hannesfritz
29
980
erikaheidi
15
4.5k
mongodb
23
3.9k
searls
204
37k
destraynor
221
47k
qrush
285
19k
phodgson
88
4k
marcelosomers
221
15k
reverentgeek
167
7.3k
addyosmani
495
110k
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 = r7kamura@gmail.com
thanks! ✘ ╹◡╹ ✘ @r7kamura