title: How to update a branch w/o getting the revert from an earlier, unwanted merge of it to master
body: <p>From a post by Linus Torvalds <a href="https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt" rel="nofollow noreferrer">here</a>, Linus shows a feature branch with A and B commits prematurely merged into origin/master at M, then reverted back at W to restore the Master branch:</p>
  
  <pre><code>---o---o---o---M---x---x---W
                /
  ---------A---B
  </code></pre>
  
  <p>He goes on to show (by what I understand) that if C and D are made to complete the feature, then merging in the feature branch will lose the A and B changes because Master gets rid of them at W.</p>
  
  <p>So he suggests to revert the revert to get:</p>
  
  <pre><code>---o---o---o---M---x---x---W---x----Y
                /
  ---------A---B---C---D
  </code></pre>
  
  <p>where Y is the revert of W, then merge in the feature branch.</p>
  
  <p>Now this is all good - it makes sense.</p>
  
  <p>I'm however not ready to put the feature branch into Master. I do though wish the latest master changes so merge those into my feature branch.</p>
  
  <p>But then my feature branch is also getting the W revert, undoing A and B in it. </p>
  
  <p>If I revert the revert at Y the merge into my branch, then I suspect my feature branch will be ok, but then Master will have my feature in it which I don't wish yet.</p>
  
  <p>How do I update from master without getting the revert at W?</p>