Speedy Git

How to increase the speed from brain to/from git

Transcript

1. Speedy Git Paul McGrath
2. Contents Speedy Input Speedy Visualisation Speedy Workflow
3. Speedy Commands  git push master~2:master  git pull –rebase  (git fetch origin, git rebase origin/master)
4. Speedy Commands  Interactive rebase (rebase –i)
5. Speedy Aliases (.gitconfig)
6. 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
7. Console 2
8. Use your favourite log viewer  ~/.bashrc:
9. mergetool, difftool setup
10. 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
11. Git workflow  Git docs: Branching strategy ( http://git-scm.com/book/en/v2/Git-Branch ing-Branching-Workflows )
12. Not like this…
13. 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
14. 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…
15. Github forks
16. Speedy Integration
17. Speedy Git