Your original structure would not support rebasing. Let's say you had a commit to your local master
and someone else had committed (and pushed) another change to origin/master
. In this scenario, you could rebase your commit on top of the other commits.
Your scenario has a commit from a completely different branch. You would either need to merge your other branch into master
, or you could cherry pick that one commit and apply to the master
branch.