Git workflow

Transcript

1. Git workflow by @r7kamura
2. workflow
3. checkout -b feature commit rebase commit rebase commit merge master feature
4. checkout commit -m “add foo” rebase commit rebase commit merge master feature
5. checkout commit rebase master commit rebase commit merge master feature
6. checkout commit rebase commit -m “add bar” rebase commit merge master feature
7. checkout commit rebase commit rebase master commit merge master feature
8. checkout commit rebase commit rebase commit -m “add baz” merge master feature
9. checkout commit rebase commit rebase commit merge feature --no-ff master feature
10. checkout commit rebase commit rebase commit merge feature --no-ff master feature push ghe feature Use merge button on GHE
11. tips
12. $ git config push.default tracking $ git push -u origin feature $ git push tips 1: git push without args
13. $ git config push.default current $ git push tips 1: git push without args
14. tips 2: tig
15. 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
16. tips 4: git blame with editor
17. tips 5: show current branch show current branch by tmux-powerline
18. tips 6: partial config file # ~/.gitconfig [include] path = .gitconfig.local # ~/.gitconfig.local [user] email = r7kamura@gmail.com
19. thanks! ✘ ╹◡╹ ✘ @r7kamura