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