Git Rebase

Introduction to Git Rebase by me at Inviqa Enlighening Lunch

Transcript

1. git rebase by Arturas Smorgun, Inviqa Enlightening Lunch
2. • Git Internal Data Structures; • Interactive Rebase; • Basic Rebase; • Less Basic Rebase; • Use Case. Contents
3. Git Internals Data structures
4. • Content-addressable filesystem; • Insert content -- get key back; • You can add to graph, but not edit or remove. Git
5. • blob -- file contents • tree -- directory layouts and filenames • commit -- forms git commit graph • tag -- annotated tag Objects
6. References • Pointer to an object: • branch • remote branch • lightweight tag
7. Symbolic references • Pointer to another pointer: • HEAD
8. Interactive Rebase
9. $ git rebase -i HEAD~3
10. Interactive • Remove or rearrange commits; • Edit commit messages; • Amend commits; • Squash several commits; • Run shell commands.
11. --autosquash • Used in interactive rebase; • Commits starting with “squash! “ will be automatically marked to squash.
12. Basic Rebase
13. $ git rebase <newbase> <newbase> - branch, to which rebasing;
14. git rebase • Forward-port local commits to the updated upstream head (from manual); • One of the ways to integrate changes from one branch to another (from the internets).
15. How it works? • Go to common ancestor; • get diff by each commit of current branch; • save diffs to temporary files; • reset current branch to same commit as branch you rebasing onto; • apply each change in turn.
16. ^ say we have this
17. ^ $ git rebase master
18. Less Basic Rebase
19. $ git rebase --onto <newbase> <base> <tip> <newbase> -- branch, to which rebasing; <next> -- ancestor of rebase branch; <topic> -- tip of rebase branch;
20. ^ say we have this
21. ^ after rebase --onto
22. Final Note (instead of conclusion)
23. Do not rebase commits that you have pushed to a public repository.
24. Questions?
25. Thank you! See Inviqa Training “Git Beyond the Basics” by Alistair Stead and “Pro Git” ebook at http://git-scm.com/book by Scot Chacon