I feel like this is "solving" a problem that doesn't exist in good workflows. How often are you pulling from a shared branch that you are making local commits to? Each of the people in the video should be branching off main and doing pull requests to get back into main.

I've not used "git pull" since 2010. I always "git fetch" remote objects, and rebase with an explicit "git rebase".

Great explanation, just last week I was explaining these concepts to a new dev in our team. The visuals are really helpful to get the point across.

Finally someone can explain something in an understandable way. This guy should be an educator.

Awesome! I completely agree with this approach. I use a slightly different alias, but that's it.

It provides a clean commit history, without actually rewriting the commit history.

I wish more developers in the company used this approach.

don't forget autostash

alias gupa="git pull --rebase --autostash"

isn’t this what —ff-only is for?