Get The Best From Git

Continuous Lifecycle, London

Transcript

1. Get The Best From Git Lorna Mitchell, Continuous Lifecycle 2016
2. Git Archaeology
3. Git Archaeology The art of finding things in a tangled history of code
4. Git Log • git log default format • git log --stat show which files were changed and how much • git log --oneline summary format • git log --graph how commits are linked • git log --decorate label branches/tags
5. Git Show git show [committish] gives full details of the commit, including diff
6. Git Diff Useful switches to git diff: • --color-words to show adds/deletes inline • --stat to show a list of changed files with an indication of how much changed in each • -w ignore whitespace Just this branch: git diff HEAD...master
7. Git DiffTool Replace diff with difftool in any command to use a different diff viewer. Set your config: git config diff.tool meld
8. Git Bisect 'when did this stop working ...?' • git bisect start to start bisecting • git bisect good|bad committish to set up the range to test
9. Advanced Git: Bisect Git checks out a series of revisions • Test each one • Type git bisect good|bad as appropriate each time • Then git bisect reset to stop bisecting
10. Git Branching
11. A Branch is a Label Take a look in .git/refs/heads/ • A branch is a pointer to a commit. • You commit on a branch, the commit is created and the pointer updated.
12. Commits Aren't "On" Branches
13. Commits Aren't "On" Branches
14. Branching Strategies
15. Branching Strategies A living, changing process document.
16. Git Flow Comprehensive branching strategy, supported by scripts. • Article: http://lrnja.net/1ebawKU • Scripts: https://github.com/nvie/gitflow
17. Topic Branches Pattern Starting something new? Use a branch.
18. Topic Branches Pattern Rebase branch onto master, review and merge
19. Alternatively: Github Flow Use with feature toggles
20. Branch Naming • master default branch name • develop often used for bleeding edge branch Configure your repo accordingly
21. Hotfix Pattern
22. Hotfix Pattern Branch off, commit once, merge with --no-ff • makes it very clear what happened • easily merge the branch back upstream if needed • makes it possible to cleanly undo without losing anything
23. Environment Branches
24. Environment Branches Maintain one branch per platform • branch always reflects current state of platform • plays well with automated deployment
25. Tagging for Releases Use annotated tags and attach a message git tag -a v2.11 -m "v2.11 with caching" Integrate build tools to react to tag via hook/webhook
26. Deployables vs Repositories • does each repository only hold one deployable item? • does each deployable rely on multiple repositories? • git submodules • dependency management
27. Resources • These slides: http://lornajane.net/resources • My git book: http://gitworkbook.com/ • Commit messages: http://chris.beams.io/posts/git-commit/
28. Sample Branching Strategies • GitHub Flow: http://lrnja.net/1Gr29Jn • Git Flow: http://lrnja.net/1ebawKU • Atlassian blog: http://lrnja.net/1BSFQcQ • Docs from GitLab: http://lrnja.net/1AiPxQJ