Git Internals - Diff and Patch (merge & rebase series - part 1)

I have received many requests to cover the topics of merge and rebase. But as I like to do in this channel, I would like to set all the foundations first, and really understand what’s going on. To do that, we will start with git’s diff and patch. We will learn how git treats patches, and how it applies patches. We will then apply our knowledge to understand the process of merge and rebase. ====================== 📕 My book "Gitting Things Done" is officially out! Get it on Amazon: https://www.amazon.com/dp/B0CQXTJ5V5 As an eBook: https://www.buymeacoffee.com/omerr/e/197232 Or read it for free at: https://www.freecodecamp.org/news/gitting-things-done-book/ ====================== Git Diffs algorithms: https://en.wikipedia.org/wiki/Diff The most default diff algorithm in Git is Myers: https://www.nathaniel.ai/myers-diff/ https://blog.jcoglan.com/2017/02/12/the-myers-diff-algorithm-part-1/ https://blog.robertelder.org/diff-algorithm/ More about Git Diff: https://www.oreilly.com/library/view/git-pocket-guide/9781449327507/ch11.html ====================== Support this channel: My mission is to create free, accessible, visual and practical tutorials. If you would like to support me on this, you can buy me a coffee :) https://www.buymeacoffee.com/omerr Thank you!! ====================== ====================== How do I make videos? I often get questions about the tools I use to create Videos - so here they are :) (When available, I may use affiliate links and may earn a commission, with NO additional cost to you) To create the hand-drawn animations, I use VideoScribe: https://www.awin1.com/cread.php?awinmid=8913&awinaffid=1128583 I edit using Descript: https://www.descript.com/?lmref=Ux4_CA Creating video thumbnails: https://snappa.com/?afmc=3uh Microphone: Yeti Blue: https://amzn.to/3QydgtP Drawing: Wacom Intuos: https://amzn.to/3pyRXwh ====================== Video created by Omer Rosenbaum. All rights reserved.