u/daviwilSystem Craftersin r/emacs • Recommends
Clean Your Commits Like a Git Rebase Expert with Magit
0:00 / 0:00
Fix Your Git Commits Like a Rebase Expert with Magit
System Crafters
39K subscribers • 42 videos on Hallway
- Recommended by 1 person: 1 in engineering communities.
- Presented by David Wilson
- Linked in the descriptionSystemCrafters/filet-magit
Intermediate. Assumes working knowledge.
14K views5 years ago1 recommendation
Tools and practiceVim, Emacs and editorsGit and version control
David Wilson demonstrates how to use Magit's interactive rebase features to edit, reorder, combine, and delete Git commits.
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: systemcrafters.net/mastering-git-with-magit/using-interactiv… Example repository: github.com/SystemCrafters/filet-magit Related videos: - An Introduction to the Ultimate Git Interface, Magit!: youtu.be/_zfvQkJsYwI - 9 Techniques to Boost Your Git Workflow with Magit: youtu.be/qPfJoeQCIvA Chapters: - Intro - Getting started - Reviewing our commits - We've got some work to do - An important tip! - Rewording commits - You just changed history! - Reordering commits - Dealing with conflicts when moving commits - Editing a commit - Combining commits - Deleting commits - Let's do it all at once! My Emacs configuration: config.daviwil.com/emacs My system configurations: config.daviwil.com/systems If you enjoy the content I make on this channel, please consider supporting my work: systemcrafters.net/support-the-channel Get System Crafters merch here: store.systemcrafters.net?utm_source=video Chat with the System Crafters community on Discord and IRC: systemcrafters.chat Follow me on Twitter for more GNU Emacs and GNU Guix content! twitter.com/SystemCrafters Check out my other video series! - Emacs Essentials: youtube.com/watch?v=48JlgiBpw_I&list=PLEoMzSkcN8oPZvSdewHG8u… - Emacs From Scratch: youtube.com/watch?v=74zOY-vgkyw&list=PLEoMzSkcN8oPH1au7H6B7b… - Emacs Tips: youtube.com/watch?v=wKTKmE1wLyw&list=PLEoMzSkcN8oMHJ6Xil1Ydn… - Emacs Desktop Environment: youtube.com/watch?v=f7xB2fFk1tQ&list=PLEoMzSkcN8oNPbEMYEtswO… - Emacs IDE: youtube.com/watch?v=E-NAM9U5JYE&list=PLEoMzSkcN8oNvsrtk_iZSb… - Emacs Mail: youtube.com/watch?v=yZRyEhi4y44&list=PLEoMzSkcN8oM-kA19xOQc8… - Learning Emacs Lisp: youtube.com/watch?v=RQK_DaaX34Q&list=PLEoMzSkcN8oPQtn7FQEF3D… - Craft Your System with GNU Guix: youtube.com/watch?v=iBaqOK75cho&list=PLEoMzSkcN8oNxnj7jm5V2Z… Thumbnail image credit: Photo by Oliver Hale on Unsplash: unsplash.com/photos/oTvU7Zmteic Music credits: Coriolis Effect by logos feat. stefsax, licensed Creative Commons 3.0 CC-BY ccmixter.org/files/mseq/26296 reNovation by airtone, licensed Creative Commons 3.0 CC-BY ccmixter.org/files/airtone/60674 ukeSounds by airtone, licensed Creative Commons 3.0 CC-BY ccmixter.org/files/airtone/32655 Between Worlds (Instrumental) by Aussens@iter, licensed Creative Commons 3.0 CC-BY ccmixter.org/files/tobias_weber/56664Why it's here
1 person recommends thisWhat people say. Recommended as an excellent tutorial on mastering interactive Git rebasing using the Magit interface in Emacs.