1 line
3.2 KiB
Plaintext
1 line
3.2 KiB
Plaintext
<p><img src="https://thumbnails.lbry.com/zM7K1y4h6UQ" width="480" alt="thumbnail" title="Clean Your Commits Like a Git Rebase Expert with Magit" /></p>In this video, we'll learn how to use Magit's interactive rebase feature to rewrite commit history and clean up a set of messy commits. I'll show how to edit, reorder, combine, and delete commits! We'll also learn what to do when editing commits creates a conflict that must be resolved.<br /><br />Show notes: https://systemcrafters.net/mastering-git-with-magit/using-interactive-rebase/<br /><br />Example repository: https://github.com/SystemCrafters/filet-magit<br /><br />Related videos:<br /><br />- An Introduction to the Ultimate Git Interface, Magit!: https://youtu.be/_zfvQkJsYwI<br />- 9 Techniques to Boost Your Git Workflow with Magit: https://youtu.be/qPfJoeQCIvA<br /><br />Chapters:<br /><br />- 00:00 Intro<br />- 00:27 Getting started<br />- 01:11 Reviewing our commits<br />- 03:03 We've got some work to do<br />- 03:39 An important tip!<br />- 05:08 Rewording commits<br />- 07:59 You just changed history!<br />- 09:16 Reordering commits<br />- 11:43 Dealing with conflicts when moving commits<br />- 15:58 Editing a commit<br />- 17:44 Combining commits<br />- 20:09 Deleting commits<br />- 21:56 Let's do it all at once!<br /><br />My Emacs configuration: https://config.daviwil.com/emacs<br />My system configurations: https://config.daviwil.com/systems<br /><br />If you enjoy the content I make on this channel, please consider supporting my work: https://systemcrafters.net/support-the-channel<br /><br />Get System Crafters merch here: https://store.systemcrafters.net?utm_source=video<br /><br />Chat with the System Crafters community on Discord and IRC: http://systemcrafters.chat<br /><br />Follow me on Twitter for more GNU Emacs and GNU Guix content!<br />https://twitter.com/SystemCrafters<br /><br />Check out my other video series!<br /><br />- Emacs Essentials: https://www.youtube.com/watch?v=48JlgiBpw_I&list=PLEoMzSkcN8oPZvSdewHG8uApD7THlLLCV<br />- Emacs From Scratch: https://www.youtube.com/watch?v=74zOY-vgkyw&list=PLEoMzSkcN8oPH1au7H6B7bBJ4ZO7BXjSZ<br />- Emacs Tips: https://www.youtube.com/watch?v=wKTKmE1wLyw&list=PLEoMzSkcN8oMHJ6Xil1YdnYtlWd5hHZql<br />- Emacs Desktop Environment: https://www.youtube.com/watch?v=f7xB2fFk1tQ&list=PLEoMzSkcN8oNPbEMYEtswOVTvq7CVddCS<br />- Emacs IDE: https://www.youtube.com/watch?v=E-NAM9U5JYE&list=PLEoMzSkcN8oNvsrtk_iZSb94krGRofFjN<br />- Emacs Mail: https://www.youtube.com/watch?v=yZRyEhi4y44&list=PLEoMzSkcN8oM-kA19xOQc8s0gr0PpFGJQ<br />- Learning Emacs Lisp: https://www.youtube.com/watch?v=RQK_DaaX34Q&list=PLEoMzSkcN8oPQtn7FQEF3D7sroZbXuPZ7<br />- Craft Your System with GNU Guix: https://www.youtube.com/watch?v=iBaqOK75cho&list=PLEoMzSkcN8oNxnj7jm5V2ZcGc52002pQU<br /><br />Thumbnail image credit:<br />Photo by Oliver Hale on Unsplash: https://unsplash.com/photos/oTvU7Zmteic<br /><br />Music credits:<br /><br />Coriolis Effect by logos feat. stefsax, licensed Creative Commons 3.0 CC-BY http://ccmixter.org/files/mseq/26296<br />reNovation by airtone, licensed Creative Commons 3.0 CC-BY http://ccmixter.org/files/airtone/60674<br />ukeSounds by airtone, licensed Creative Commons 3.0<br />...<br />https://www.youtube.com/watch?v=zM7K1y4h6UQ |