Rebase my changes on top of another branch updates in Sublime Merge

Question

I cloned a Git repo/branch (origin/master). I made my changes and committed on another branch (mine) and I set another remote for it (office/mine). I did three commits actually.

Now there are updates on origin/master that I need to incorporate. I guess what I need is to rebase my changes on top of latest origin/master, but I'm not quite sure how to proceed.

I'm using Sublime Merge and I can't see that option or I'm not looking on the right menus.

Answer 1

Here is how to replicate the command git rebase origin/master mine in Sublime Merge:

• Check out the branch you want to rebase (mine).
• In the "Commits" view (Ctrl+2 by default), right-click on the latest commit of the branch you want to rebase onto (origin/master).
• Choose "Rebase mine onto origin/master".