Uploaded byMichał Czyż
Git - merge vs rebase [mikstura.it #4]
based on http://mislav.uniqpath.com/2013/02/merge-vs-rebase/ video - presentation in polish language, is here: https://vimeo.com/62857860
Git - merge vs rebase [mikstura.it #4]
- 1. Merge vs Rebase by cs3b, the Lumberjack Tuesday, April 2, 13
- 2.
- 3.
- 4.
- 5. Git http://betterexplained.com/articles/intro-to-distributed-version-control-illustrated/ Tuesday, April 2, 13
- 6.
- 7.
- 8.
- 9.
- 10. git pull http://learningtoteachscience.files.wordpress.com/2011/12/31.gif Tuesday, April 2, 13
- 11. git pull http://stevenharman.net/images/posts/y-u-no-rebase-preview.jpg Tuesday, April 2, 13
- 12. git pull --rebase http://johnmdonahue.com/images/rebase-no-conflict.jpg Tuesday, April 2, 13
- 13. git pull --rebase Tuesday,April 2, 13
- 14. git pull --rebase git config --global Tuesday, April 2, 13
- 15. git pull --rebase git config --global --bool pull.rebase true Tuesday, April 2, 13
- 16. git pull --rebase git config --global --bool pull.rebase true Tuesday, April 2, 13
- 17.
- 18. git local rebase http://sd.keepcalm-o-matic.co.uk/i/keep-calm-and-git-rebase.png Tuesday, April 2, 13
- 19. git rebase -i@{u} http://rypress.com/tutorials/git/media/5-5.png Tuesday, April 2, 13
- 20. why git localrebase Tuesday, April 2, 13
- 21. why git localrebase squashing related commits Tuesday, April 2, 13
- 22. why git localrebase squashing related commits rewording commit messages Tuesday, April 2, 13
- 23. why git localrebase squashing related commits rewording commit messages easier git pull --rebase Tuesday, April 2, 13
- 24.
- 25.
- 26. Merge instead of rebase when? http://rypress.com/tutorials/git/media/5-1.png Tuesday, April 2, 13
- 27.
- 28.
- 29. merge object git merge --no-ff feature Tuesday, April 2, 13
- 30. merge object http://en.wikipedia.org/wiki/File:Yes_check.svg Tuesday, April 2, 13
- 31. merge object where come from http://en.wikipedia.org/wiki/File:Yes_check.svg Tuesday, April 2, 13
- 32. merge object where come from when were merge http://en.wikipedia.org/wiki/File:Yes_check.svg Tuesday, April 2, 13
- 33. merge object where come from when were merge and by whom were merged e.g code review http://en.wikipedia.org/wiki/File:Yes_check.svg Tuesday, April 2, 13
- 34. merge object where come from when were merge and by whom were merged e.g code review commits related are grouped together http://en.wikipedia.org/wiki/File:Yes_check.svg Tuesday, April 2, 13
- 35. merge object http://2.bp.blogspot.com/-dWAyVooVf8E/T3ib0pcyMvI/AAAAAAAAAI4/IcIQbEwsn8A/s1600/no.png Tuesday, April 2, 13
- 36. merge object where from is irrelevant http://2.bp.blogspot.com/-dWAyVooVf8E/T3ib0pcyMvI/AAAAAAAAAI4/IcIQbEwsn8A/s1600/no.png Tuesday, April 2, 13
- 37. merge object where from is irrelevant when and who are already in commit timestamp http://2.bp.blogspot.com/-dWAyVooVf8E/T3ib0pcyMvI/AAAAAAAAAI4/IcIQbEwsn8A/s1600/no.png Tuesday, April 2, 13
- 38. merge object where from is irrelevant when and who are already in commit timestamp there is nothing to grouped together http://2.bp.blogspot.com/-dWAyVooVf8E/T3ib0pcyMvI/AAAAAAAAAI4/IcIQbEwsn8A/s1600/no.png Tuesday, April 2, 13
- 39. merge object git cherry-pick feature http://en.wikipedia.org/wiki/File:Yes_check.svg Tuesday, April 2, 13
- 40. http://rypress.com/tutorials/git/media/5-1.png http://2.bp.blogspot.com/-dWAyVooVf8E/T3ib0pcyMvI/AAAAAAAAAI4/IcIQbEwsn8A/s1600/no.png Tuesday, April 2, 13
- 41. one more don’t try this at home http://rypress.com/tutorials/git/media/5-1.png http://2.bp.blogspot.com/-dWAyVooVf8E/T3ib0pcyMvI/AAAAAAAAAI4/IcIQbEwsn8A/s1600/no.png Tuesday, April 2, 13
- 42. git push --force http://anongallery.org/8156/ Tuesday, April 2, 13
- 43.
- 44.