For me personally understanding the on or onto wording for rebase as it's also used in the git reference actually helped me when I learned about it originally.
I take my changes, which where originally based on some branch HEAD, and I put them onto some other branch's current state (or state of the same branch)
Like I said, it is semantics, but I've found that slight change in wording useful for some when helping them understand rebase.
Agreed - I completely misunderstood this at first because “rewind and rebase onto” sounds like “take my work from ‘add_patrick’, add all those commits “onto” ‘master’ (which doesn’t happen & wouldn’t really make sense) before moving the divergence point & continuing on the current branch.
The key point to understand is that you get all new commits from ‘master’ so your current branch is up to date with it (kinda like a git pull), then reapply the commits from ‘add_patrick’ again from that new point of divergence from master, but still on ‘add_patrick’ itself.
That confusion on my part aside, I found this to be a fantastic overview! Thanks!
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.