title: How do you rebase the current branch's changes on top of changes being merged in?
body: <p>Okay. If I'm on a branch (say <code>working</code>), and I want to merge in the changes from another branch (say <code>master</code>), then I run the command <code>git-merge master</code> while on the <code>working</code> branch, and the changes get merged in without rebasing the history at all. If I run <code>git-rebase master</code>, then the changes in <code>master</code> are rebased to be put on the top of my <code>working</code> branch. But what if I want to merge in the changes from <code>master</code> but rebase my changes in <code>working</code> to be on top? How do I do that? Can it be done?</p>
  
  <p>I could run <code>git-rebase working</code> on my <code>master</code> branch to put my changes on top in the <code>master</code> branch, but I'd like to be able to do that in my <code>working</code> branch, and I have no idea how. The closest that I can think of doing is creating a new branch from <code>master</code> and then rebase <code>working</code>'s changes on top of that, but then I'd have a new branch instead of altering the <code>working</code> branch.</p>