title: How to develop my code using another commit but without incorporating that into my patch
body: <p>I'm attempting to develop my own code on my own development branch <code>D</code>. I can't test with <code>master</code> code because someone recently introduced a bug (call that commit <code>B</code>) that interferes with my code. Now, while they work to fix their bug and move their code forward, some other kind soul has posted a patch to our Gerrit server, <code>R</code>, that reverts patch <code>B</code>. So, I have the option to use cherry-pick or download or pull or format-patch to get hold of <code>R</code>, and if I do so, I can develop and test my own code quite well.</p>
  
  <p>The problem is that at some point I am going to want to submit my own patch for review. I don't want to interfere with anyone else's files, so I don't want the changes in <code>R</code> to be included in my own commit.</p>
  
  <p>What I've been doing is:</p>
  
  <ol>
  <li>edit my own code</li>
  <li>commit my changes to development branch <code>D</code></li>
  <li>use <code>git rebase -i HEAD~2</code> to squish these changes with my previous work</li>
  <li>cherry-pick the revert patch <code>R</code></li>
  <li>build and test my code</li>
  <li>use <code>git rebase -i HEAD~2</code> to cut commit <code>R</code> out of my local code</li>
  <li>(now I'm free to either push my changes or go back to #1 and iterate)</li>
  </ol>
  
  <p>My question is, can I cut steps #4 and #6 out of this workflow and still get back to something that I can push without interfering with the other efforts to fix bug <code>B</code>?</p>
  
  <p>At present there is no overlap between the files involved in <code>R</code> and my own work, and I don't <em>think</em> that is likely to change.</p>