Learn how to rewrite Git history - Amend, Reword, Delete, Reorder, Squash and Split

In this video I'll dive into some of the ways Git allows us to rewrite commit history. Specifically I cover: amending commits, rewording commit messages, deleting commits, reordering commits, squashing commits and splitting commits.
FULL WRITEUP: www.themoderncoder.com/rewrit...
MORE GIT VIDEOS: • Git
CHAPTERS
0:00 Intro
0:40 Amending commits
2:04 Rewording commits
4:14 Deleting commits
5:34 Reordering commits
7:04 Squashing commits
9:09 Splitting commits
MY TECH
2020 M1 MacBook Air (I have the 512GB variant): amzn.to/3TTIBsE
AirPods Pro: amzn.to/3sRLUo5
Gaming headset: amzn.to/3zwbT8i
Headphones (newer model): amzn.to/3Ub5reT
Keyboard: amzn.to/3FOOOC7
Mouse: amzn.to/3WhMFV9
Monitor: www.dell.com/en-us/work/shop/...
Monitor arm (newer model): amzn.to/3gXnlUa
Webcam: amzn.to/3zxxwp0
TECH ACCESSORIES
Laptop stand: amzn.to/3NuyqZ5
Mouse pad/mat: amzn.to/3U9QFVO
KVM switch: amzn.to/3gZmpP0
PC case: amzn.to/3Fx4Hg5
Under desk drawer: amzn.to/3WloFAo
VIDEO GEAR
Camera: amzn.to/3WkbiRe
Lens: amzn.to/3zxiTC4
Microphone: amzn.to/3SSUoWE
Main key light: amzn.to/3WhZbny
Secondary light: amzn.to/3fpRefx
^ Note for the Amazon links above: as an Amazon Associate I earn from qualifying purchases.
ABOUT ME
I'm a professional software engineer working at Amazon in New York City. I enjoy making videos about the tech industry so if you have a question please get in touch either through the comments or any of my socials and I'd be happy to help out. Thanks for checking out the channel!
FOLLOW ME
Website: www.themoderncoder.com
Instagram: / themoderncoder
Twitter: / themoderncoder
Join the email list for tips curated to improve your dev skills delivered monthly to your inbox: www.themoderncoder.com/email-...

[@themoderncoder]

I HAVE MORE GIT VIDEOS! kzbin.info/aero/PLfU9XN7w4tFwKwh_xPSQ_X1-hROQEpHnM. Additionally, a written reference for this video is available on my blog: www.themoderncoder.com/git/

[@tomng92]

Pure gold! Learnt faster in those 12 mins than reading any book.

[@RedFenceAnime]

put the timestamps before the topic in the description and KZbin will automatically add chapters to the progress bar 0:00 - intro 0:40 - Amending commits 2:04 - Rewording commits 4:14 - Deleting commits 5:34 - Reordering commits 7:04 - Squashing commits 9:09 - Splitting commits The "0:00" is needed

[@ozen8499]

thx

[@themoderncoder]

Good tip thanks. I went ahead and made those changes

[@gaofan2856]

Perfect video, short, precise with visualization. Not like telling the history of git for 40 minutes, and then start explaining things like others do

[@Trhnetesiuz]

3 hours of other videos in 13 minutes. Awesome. Thanks a lot

[@losrobbosful]

This was gold, helped me a lot. Definitely great teaching abilities.

[@cddrury]

Great explanation and the graphical representation you used while typing the commands made it much easier to understand from a visual perspective. Keep up the good work!

[@thesavagesalmon9464]

This channel is COMPLETELY underrated. You deserve a tonne more subscribers. Keep consistently making quality videos such as this, and you will make it bigger in no time!

[@fahadmubeen6272]

Really like the video, and the written blog is good too. Clear, concise and to the point.

[@vaibhavgarg5607]

Was stuck on a PR as I was unable to edit a commit's changes this video saved me. Really helpful

[@zmark2274]

Can't express how thankful I am to you. So accurate and informative. Thank you indeed

[@abdul-aleemelmuzoghi4133]

Been 2 days trying to learn how to delete a commit and you just came and and did it in 2 minutes

[@peterdoyle1994]

Best, clearest git tutorials by a country mile. Thanks.

[@nikolajovanovic1140]

Concise and straight to the point. Bravo!

[@najimali32]

Your Git Videos are really helping me to play with my commits & branch at work. Thank you so much.

[@pascualrosario8633]

You have a gift for teaching. Very concise and easy to understand.

[@arthurh2064]

I wish you wouldn't have stopped uploading git tutorials, they are by far the best I've seen and I've seen many

[@codewithsub5083]

This is the best tutorial of git I have ever seen. Thanks man

[@786saga]

Dude it really helped me a lot i was missing the few of these concepts of git thank you.

[@danielwestberg9540]

Very well explained! Super good with the visual branches to better understand what's happening

[@slavoie]

Thanks for this! If you stick to Vim as the default Git text editor, you may want to know about the following commands as a starting point: gg → Go to top of buffer/file. ddp → Delete a line and put it below the current one (to re-order commit). `dd` deletes a line while `p` put it below the current line. ddkP → Delete a line and put it above the current one. `dd` deletes a line, `k` moves up one line and `P` (uppercase) pastes above the current line. h / j / k / l → Move around à la Vim. x → Delete a character xp → Switch the order of two characters. G → Go to the end of the buffer/file. ZZ → Save and quit buffer. For this purpose, same as `:wq` but less keystrokes ;). There's obviously much more to learn, but that should be useful to at least do some basic operations. Also, when splitting a commit, a single file might be part of two commits. So to commit only part of a file, there's also an interactive staging mode: git-scm.com/book/en/v2/Git-Tools-Interactive-Staging

[@SomeYouTubeGuy]

Great comment but I'm surprised you didn't include 'dw'. No one should be backspacing a word in Vim

[@joshuakoehler6457]

@@SomeKZbinGuy I thought a similar thing, but would recommend 'cw' (change word) instead, which enters you into insert mode after deleting the word. So it is equivalent to 'dw' + 'i'

[@SomeYouTubeGuy]

@@joshuakoehler6457 It would seem you know a tiny bit more Vim than I.

[@diegoarielbaezrenault3133]

Best explanatory video on all this subjects! Thanks and keep up the good work!

[@AdamTheBen]

Thank you very much for your content. Extremely helpful. Love the animations, they make it so easy to wrap your head around the concepts.

[@sumanghosh4439]

Excellent! Thank you so much for this video. I have struggled with rebasing and was scared. But your teaching skill is excellent and I learnt in few minutes and used it successfully.

[@d-e-v-esh]

This is the best video by far I have seen on KZbin. Thank you so much man....

[@m4rt_]

Holy shit, git rebase is powerful. I will keep this in mind whenever I want to fix something in my git history.

[@vishnuthamizharasan6192]

I have searched for answers and videos I didn't get anywhere, but the way you explain git is amazing and one of the best explanations ever seen. You are soo good at Git man. Thanks for the Video. Please make more videos. I love it

[@fullstackprojects5615]

git rebase is a very powerful tool. Thanks for sharing your knowledge :)

[@daggerok]

1) in vim instead of :wq you can use :x its shorter 2) when explaining drop, you should mention, that changes in README file also will be reverted, not only commit message from git history, so people who wants only remove commit message, but not changes should use fixup 3) in vim, instead of cut-paste, use copy (press yy on line to copy in command mode) + paste (press p on line above place where you want paste) + delete (press: dd on line to delete)

[@mariano.zunino]

3) dd and P was all he need. No yank was needed in this video.

[@Andriak2]

To clarify in 3) dd is like cut, yy is like copy, p is like paste (but using registers instead of clipboard)

[@kapaaaau]

This is the best explanation I have seen for Git's commands, and they are real world solutions for real world problems. Thank you very much.

[@MartijnMuijsers]

Great concise explanation of everything that might matter to someone!

[@AIGenerated]

Good job this video looks edited by a professional company, the animations really help, keep up the good work

Omg did not know that is possible to reording commits. So darn simple! Thank you!

[@sebastianfarias5670]

Simply the best GIT explanation ever, super concise and really helped me get out of a pickle today !!! THANK YOU !

[@krazee_aznnn]

I mean, so many comments before have said this, but I need to confirm: this tutorial was more clear and understandable than the articles and other videos I watched about rebasing and changing Git commit history! I get it now!

[@nrmlkmrks]

Awesome video! Great example of explaining stuff to the point with really good examples.

[@gabrielsoloman5000]

best series on non-basic git, congrats

[@moe-eh5vi]

I like that this video is recorded in a kitchen. Makes it feel less intimidating. Also very clear explanations.

[@ianedits1]

Short and precise. Good job sir

[@videet]

Clear and crisp. Thank you.

[@greenmanreddog]

Very clear and concise explanations - thanks.

[@nospecialmeaning2]

Subscribed! You might be the only KZbinr I have an occasional compulsion to listen to at lower than normal speed :D

[@RubenDias93]

Great tutorial! Very useful and nicely explained.

[@rabishankar5993]

Hidden gems of youtube.

[@zmark2274]

Over and over hank you again to express yourself in so clear way

[@przemekostrowski3108]

Very good video. Well explained. Thank you!

[@Anujgupta-yi9di]

Great job! Explains everything so easily :)

[@mr.w7803]

All things I've done before, but I do them so infrequently I forget the work flow... thank you so much for the walk through!

[@NirdeshM]

Very informative with awesome explanation.

[@louaiforui]

Great job! great explanation!

[@gabrielsanmartin8326]

Awesome buddy! I'm trying to go deep into git.. and this video was gold.

[@alpavaidya412]

The animation is what is required to understand Git commands...thanks for making the effort to make them to explain....please make more videos on Git

[@Mark986270]

Thank you very much. This was just what I needed to clean up my merge requests

[@VKD007]

i fixed something today by manual merging with dev branch if i knew this before i wouldnt need to do manual work. Thanks man nice videos

[@SakhawatHossainlive]

Wonderful !! Thanks for this video man.

[@JoshuaMusau]

You make a really good teacher...

[@qCJLbggG4IWAY9nTH6o]

I'm thankful for your content

[@Kamaltweet]

Wow. You made it so easy to learn. Thank you 🙏

[@shivanjalikaname8935]

Voila...you gained a subscriber.. just loved the way you explain technically and practically

[@SarnenduMukherjee]

Thank you for this superb video. Awesome animation and edit makes this video more awesome.

[@donalexey]

This is just a great tutorial!

[@Pumazr]

Great video, so clean explanation.

[@bseroy]

These videos are fantastic!

[@violindiep]

Very clear explanation, thanks !

[@rockydev5750]

Amazing Dude! Thanks for your video.

[@pradeepnooney3056]

Thank you so much. Very good tutorial. and good animation too

[@alexanderjesusvargas5998]

It is crazy this is free content!

[@martinspilovsky9071]

Thank you so much for this compilation

[@siegblink182]

Thanks for making this video. This has solved most of my problems.

[@akbarhafeezbutt1761]

Thank you very much for your knowledge sharing, you're the best!

[@rahuldasmajumder7690]

Thanks man..it really cleared the doubts✌️

[@vidyawimalasooriya6604]

Superb Explanation

[@samithakulatilaka]

Great Explanation. Thank You.

[@liminal6823]

Excellent tutorial.

[@DavidLance]

Absolute life saver! Thanks a ton for this.

[@10SURA]

Thank you very much for your content. Extremely helpful

[@youssefsabbagh4341]

Great video !! Couldn't have explained it any better !!

[@demian256able]

excelent vídeo. very clear explained. that kind of graphics are a very good idea.

[@alanjrobertson]

Another excellent video, wish you'd come back to KZbin and do more!

[@GuillermoAguilarCruz]

Thanks, you really know how to explain in a faster and cooler way. Just one question, how can I perform these operations if I have previously pushed my changes?

[@StefanBanu]

A perfect video. Thank you 🙂

[@magakz]

Awesomeee!!! Thanks man! Cool video, helped me a lot!

[@forkanali]

very helpful and short video. short time you teach me alot. thank you !

[@sekar887]

Thanks a lot for this video, this is very useful

[@jeffreyrooks9488]

Excellent video!

[@rohitkumarshrivastava9693]

You are a genius!! This video has helped me a lot

[@BG-fo4si]

You explained it beautifully

[@LeonardoBPG]

Thank you for saving my life!

[@pitter5990]

Love your videos! I hope you go ahead with them!

[@themoderncoder]

For sure. Got any idea for topics?

[@pitter5990]

@@themoderncoder Soft Skills. They are as much crucial as Hard Skills. The idea is to present the most important of them, and how can Soft Skills turn you into a rare professional.

[@soumyadrip]

Great video,solved so many doubts

[@jibaromar2249]

Amazing video man, THANKS A LOT

[@MrSchattka]

Thank you, very good tutorial.

[@ashleyrawr74]

This is such a helpful resource! :)

[@iconjack]

This was an amazing video. I learned a lot, including: I will never split a commit.

[@Dipenparmar12]

Excellent, Very helpful. Thanks

[@LNMLucasMasiero]

Thank you so much.... rebase looks like a powerful tool

[@lucasvtiradentes]

omg this video saved my life, thank you very much!!!

[@jaytran247]

great great tutorial videos. you are brilliant

[@rodhash]

crazy vid man, thanks

[@amitbd1508]

thanks man . you saved my day