Clean Your Commits Like a Git Rebase Expert with Magit

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.

Show notes: https://systemcrafters.net/mastering-git-with-magit/using-interactive-rebase/

Example repository: https://github.com/SystemCrafters/filet-magit

Related videos:

• An Introduction to the Ultimate Git Interface, Magit!: https://youtu.be/_zfvQkJsYwI
• 9 Techniques to Boost Your Git Workflow with Magit: https://youtu.be/qPfJoeQCIvA

Chapters:

• 00:00 Intro
• 00:27 Getting started
• 01:11 Reviewing our commits
• 03:03 We've got some work to do
• 03:39 An important tip!
• 05:08 Rewording commits
• 07:59 You just changed history!
• 09:16 Reordering commits
• 11:43 Dealing with conflicts when moving commits
• 15:58 Editing a commit
• 17:44 Combining commits
• 20:09 Deleting commits
• 21:56 Let's do it all at once!

My Emacs configuration: https://config.daviwil.com/emacs My system configurations: https://config.daviwil.com/systems

If you enjoy the content I make on this channel, please consider supporting my work: https://systemcrafters.net/support-the-channel

Get System Crafters merch here: https://store.systemcrafters.net?utm_source=video

Chat with the System Crafters community on Discord and IRC: http://systemcrafters.chat

Follow me on Twitter for more GNU Emacs and GNU Guix content! https://twitter.com/SystemCrafters

Check out my other video series!

• Emacs Essentials: https://www.youtube.com/watch?v=48JlgiBpw_I&list=PLEoMzSkcN8oPZvSdewHG8uApD7THlLLCV
• Emacs From Scratch: https://www.youtube.com/watch?v=74zOY-vgkyw&list=PLEoMzSkcN8oPH1au7H6B7bBJ4ZO7BXjSZ
• Emacs Tips: https://www.youtube.com/watch?v=wKTKmE1wLyw&list=PLEoMzSkcN8oMHJ6Xil1YdnYtlWd5hHZql
• Emacs Desktop Environment: https://www.youtube.com/watch?v=f7xB2fFk1tQ&list=PLEoMzSkcN8oNPbEMYEtswOVTvq7CVddCS
• Emacs IDE: https://www.youtube.com/watch?v=E-NAM9U5JYE&list=PLEoMzSkcN8oNvsrtk_iZSb94krGRofFjN
• Emacs Mail: https://www.youtube.com/watch?v=yZRyEhi4y44&list=PLEoMzSkcN8oM-kA19xOQc8s0gr0PpFGJQ
• Learning Emacs Lisp: https://www.youtube.com/watch?v=RQK_DaaX34Q&list=PLEoMzSkcN8oPQtn7FQEF3D7sroZbXuPZ7
• Craft Your System with GNU Guix: https://www.youtube.com/watch?v=iBaqOK75cho&list=PLEoMzSkcN8oNxnj7jm5V2ZcGc52002pQU

Thumbnail image credit: Photo by Oliver Hale on Unsplash: https://unsplash.com/photos/oTvU7Zmteic

Music credits:

Coriolis Effect by logos feat. stefsax, licensed Creative Commons 3.0 CC-BY http://ccmixter.org/files/mseq/26296 reNovation by airtone, licensed Creative Commons 3.0 CC-BY http://ccmixter.org/files/airtone/60674 ukeSounds by airtone, licensed Creative Commons 3.0 ... https://www.youtube.com/watch?v=zM7K1y4h6UQ