019 Introduction to git rebase

Here I cover what actually happens when you git rebase. Git rebase is a way to re-apply commits at a different point in git history -- you can think of it as changing a commit's parent but not it's "incremental content". Using rebase in your workflow lets you maintain a linear string of commits which can be useful if/when you need to squash them later.

[czaczaja]

I have been searching fora rebase tutorial for months and this is by far the best one

[wkhmusic]

That's some sick flange and pan action you got going there on the intro. Git checkout rightear. Git checkout leftear. Git checkout rightear. Git --help.

[lexer_]

I would really like to see a video on the topic of pros and cons about rebase and the different workflows!

[toofananvari]

so cool explanation, I appreciate you.

[drghartnangamn]

Thanks a lot for these tutorials! That's great!

[onurpekdemir]

Thanks a lot, Dan! Relly great explanation. :-)

[Cdswjp]

The diagrams in the beginning were perfect; helped a lot to grasp the idea compared to any other resource I've come across... I'm also a visual learner.... ie. featureX has new instances created and is added on top of the master branch

I am at a cross though as to what precisely happens when the featureX code is added on top of the master branch.... does that mean that the changes being added from featureX will be the final output?

[madanrajvenkatesan]

Your terminal looks colorful, did u make changes to the git config colors or something else ?

[kirimi]

Thanks Dan. Quick question, do you perform a merge first before rebasing or merge after rebasing?

[Cdswjp]

great videos. thanks.... watched almost all multiple times so

i'm at the end of the beginner state of learning and what im about to say may make u think, "well, why would ya do that that way?".... quick answer: "still learning".... anywho, i was

what would happen if you're in the middle of a rebase in your local master branch and you successfully create/checkout a new local branch called master-backup and then want to abort the rebase.... would abort affect the changes made in the original local master too?

[nikhileshsaggere]

Hi Dan, have a question about how rebase works internally, let's say I have adapted the gitflow workflow, and every feature branch is an independent line of development, prior to creating the pull request the feature branch needs to be rebased with develop and then it has to be merged. Assuming I am working on a feature branch, which I had rebase say every 3 days, when I am about to create the pull request I do rebase it with develop for one last time, this time does it rebase the work from the day I created the feature branc or does it rebase it with already rebased commit point (3 days ago) coz I seem to get conflicts which I had already solved in my earlier rebase exercise. Please provide your insights. Theoretically I assume it should pick from the last rebase point.

[WilsonMar]

Dan, is the create_commits.py Python history emulator program on GitHub?