Fix Your Git Commits Like a Rebase Expert with Magit

Опубликовано: 07 Сентябрь 2021
на канале: System Crafters

11,841

541

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-...

Example repository: https://github.com/SystemCrafters/fil...

Related videos:

An Introduction to the Ultimate Git Interface, Magit!:    • An Introduction to the Ultimate Git I...
9 Techniques to Boost Your Git Workflow with Magit:    • 9 Techniques to Boost Your Git Workfl...

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-th...

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!
  / systemcrafters

Check out my other video series!

Emacs Essentials:    • The Absolute Beginner's Guide to Emacs
Emacs From Scratch:    • Emacs From Scratch #1 - Getting Start...
Emacs Tips:    • Emacs Tips - How to Show Reminders fo...
Emacs Desktop Environment:    • Emacs Desktop Environment #1 - Gettin...
Emacs IDE:    • Emacs From Scratch #8 - Build Your Ow...
Emacs Mail:    • Streamline Your E-mail Management wit...
Learning Emacs Lisp:    • Introduction to Emacs Lisp - Learning...
Craft Your System with GNU Guix:    • An Introduction to GNU Guix

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 CC-BY http://ccmixter.org/files/airtone/32655
Between Worlds (Instrumental) by Aussens@iter, licensed Creative Commons 3.0 CC-BY http://ccmixter.org/files/tobias_webe...