paul mcgrath. speedy input speedy visualisation speedy workflow
TRANSCRIPT
Speedy GitPaul McGrath
Contents
Speedy InputSpeedy VisualisationSpeedy Workflow
Speedy Commands
git push master~2:master git pull –rebase
(git fetch origin, git rebase origin/master)
Speedy Commands
Interactive rebase (rebase –i)
Speedy Aliases (.gitconfig)
Using your favourite text editor
In ~/.bashrc and ~/bin My editor is much easier to use for
interactive rebase, commit –amend etc. Share your setup – it’s all config files
Console 2
Use your favourite log viewer
~/.bashrc:
mergetool, difftool setup
IF you have these problems… Features tied
together Can’t unpick the log Branching from
untested code
Your product is the sum of independent features
Features can be easily removed
You have a safe point to branch from
Git workflow
Git docs: Branching strategy (http://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows)
Not like this…
Create a safe branching point http://
scottchacon.com/2011/08/31/github-flow.html
git merge develop Keep it as light-weight as possible …Yeah, but what about conflicts?
DEVELOP
MASTER
MY LOVELY FEATURE
Speedy Branches
Avoiding conflicts Small commits merge safe point into branches Even better… rebase!
…Yeah, but I don’t want to see all these branches all over our repo…
Github forks
Speedy Integration
Speedy Git