title: GIT - undo specific past merge but need the commits made after that merge to be intact
body: <p>I was working simultaneously on a <em>Feature</em> branch and <em>Master</em> branch.</p>
  
  <p>Few days ago I merged my <em>Feature</em> into <em>Master</em>. A few commits have been made on top of that too. </p>
  
  <p>But later I realised that the feature is no more desired. So I need to remove the commits which have been incorporated due to the <em>Feature</em> branch. </p>
  
  <p>On checking, I realised that I have 3 options <em>Rebase</em>, <em>Revert</em> and <em>Cherry-pick</em>.</p>
  
  <p>I might need the commits of the <em>Feature</em> branch in future. Therefore, it's commits need to be visible in commit history/ git log etc, if I need them in the future. Hence, I am confused which option of the above three to pick. </p>
  
  <p>Note: All the commits are pushed to master. So would that have any implications on the option I pick?</p>