Download to read offline
Gitting better
- 1.
- 2. GIT-TING BETTER, CONFESSION OFA GIT ADDICT SOFTSHAKE 2016 2
- 3. 3 Grégory Bataille @gregbfiveten Pix4D Back endengineer photogrammetry
- 4.
- 5.
- 6. git init git clone gitadd git commit git push git pull 6
- 7.
- 8.
- 9. GIT-TING BETTER AGENDA ▸ Basics ▸Diffs ▸ Log(s) ▸ Rebase ▸ Interactive Manipulations ▸ A full workflow 9
- 10.
- 11. GIT-TING BETTER ARCHITECTURE BASICS ▸Commit = collection of diffs ▸ Repo = collection of commits, each commit referencing its parent(s) ▸ Branch = pointer (HEAD) on a commit 11
- 12.
- 13. GIT-TING BETTER MASTERING DIFFS ▸git diff ▸ git diff --cached ▸ git diff -w ▸ GIT 2.9 ▸ git diff --word-diff 13
- 14.
- 15. GIT-TING BETTER THE LOG(S) ▸git log ▸ git log -p ▸ git log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - … ▸ git log ____ -- FILE_PATH 15
- 16. GIT-TING BETTER THE LOG(S)- REFLOG ▸ git reflog ▸ logs of the git operations ▸ allows to go back in the past - you want to revert a rebase? ▸ git reset --hard f241d60 ▸ move the current branch’s HEAD to the HEAD@{28} state 16
- 17. GIT-TING BETTER THE LOG(S)- SHORTCUTS ▸ HEAD~x ▸ x commits before HEAD ▸ HEAD@{x} ▸ x operations before HEAD 17
- 18. GIT-TING BETTER THE LOG(S)- GIT BISECT 18
- 19.
- 20.
- 21.
- 22.
- 23. THE MERGE COMMIT REBASE- WHY? 23
- 24.
- 25. REBASE - WHAT?25 Classic merge flow Rebase flow Real commit order
- 26. REBASE - HOW?26 ▸ Tom wants to merge ▸ He rebases first (on develop, which is the fork point) ▸ Rebase will ▸ Take the 2 commits and put them in a special “stash” ▸ checkout develop ▸ replay the commits out of the stash one by one, resolving conflicts along the way
- 27. REBASE - HOW?27 ▸ Now Tom can merge ▸ Fast-forward or not?
- 28. ▸ When youare there, git tells you you have commits to push and commits to pull ▸ This is because remote still looks like this ▸ A git push will be rejected with ▸ DO NOT GIT PULL as suggested ▸ You need git push --force REBASE - CAVEATS 28
- 29.
- 30. REBASE REBASE --ONTO ▸ gitrebase --onto target from what ▸ what defaults to current branch ▸ from defaults to current branch’s remote ▸ Use case ▸ I was working out of develop on a small bug. We realised that it was bigger than expected and needed a hotfix… 30
- 31.
- 32. INTERACTIVE MANIPULATIONS WHY SHOULDI CARE? ▸ Commits should be unitary / single purpose ▸ Easier to follow the history ▸ Easier to review ▸ Easier to revert if needed ▸ Easier to isolate a change creating a bug ▸ … ▸ We are not capable of that 32
- 33. INTERACTIVE MANIPULATIONS 33 DECOMMISSIONOF TEMPORARY CODE CLEAN UP (NON FUNCTIONAL)
- 34.
- 35. INTERACTIVE MANIPULATIONS ▸ gitreset -p ▸ git checkout -p 35
- 36. INTERACTION MANIPULATIONS GIT REBASE-I ▸ Interactively change history ▸ Re-order commits ▸ Merge commits together ▸ Edit a commit 36
- 37.
- 38.
- 39. A FULL WORKFLOW THESTARTING SITUATION ▸ Sort is implemented on branch sort ▸ Sort is waiting PR ▸ I have implemented max on top of sort ▸ reverse was implemented and merged into develop 39
- 40. CONCLUSION TOOLS ▸ A craftsmanneeds to master his tools ▸ He has several ▸ git is the base (should be configured) ▸ knowing a bit of Hg might help you look at git from another angle ▸ having a visual tool is mandatory to understand complex situations ▸ if you use the command line, enhance it to give you some context https://github.com/gbataille/gitHUD 40
- 41.
- 42. 42 Grégory Bataille @gregbfiveten Pix4D Back endengineer photogrammetry