Practice rebasing

TIP

I keep a dedicated Git repo for experiments and demos

% cd ~/Sites
% git init gitscratchpad
% git commit --allow-empty -m "initial (empty)"

and switch to it as needed

# "Does `git rebase --onto` without specifying a `<branch>` work the way I think does?"
% cd ../gitscratchpad
# hack hack hack
% cd -

Build out the scenario. This is the part git-random simplifies.

% git switch main
% git random
% git switch -c feature
% git random
% git switch main
% git random

That built a tree with the same shape as this one ^[1]

* 056196f (HEAD -> main)
|
| * (feature)
|/
|
*

Now try out the rebase:

% git switch feature
% git rebase main

References

• git switch -c <newbranch>
• git rebase --onto <newbase>
• git-rebase's <upstream>.

 

 

---

1. Tree visualization generated with

   git log --graph --pretty=format:'%d' --branches

   ↩︎