title: Merge 2 different commit
body: <p>I already made a few changes on my commit and finalize my working copy, after that I did <code>git push</code> too.</p>
  
  <p>But, suddenly I found a little problem on my modified files that has been already pushed to bitbucket repo. So, without undoing, I did manually changed my files into default for the first time. This is the workflow.</p>
  
  <p><strong>C1</strong><br>
  README.md:<br>
  "<code>This is the content of the first readme on README.md</code>"</p>
  
  <ol>
  <li><code>git add README.md</code></li>
  <li><code>git commit -m 'initialize README.md'</code></li>
  <li><code>git push -u origin master</code>  </li>
  <li>DONE!</li>
  </ol>
  
  <p><strong>C2</strong><br>
  after that, I updated my files into:<br>
  <code>The content is new on README.md</code></p>
  
  <ol>
  <li>like above</li>
  <li>DONE!</li>
  </ol>
  
  <p><strong>C3</strong>
  suddenly I made a few changes like these:<br>
  <code>This is the content of the first readme on README.md
  add a few new lines
  add a few new lines
  </code></p>
  
  <ol>
  <li><code>git add README.md</code></li>
  <li>DONE!  </li>
  </ol>
  
  <p>I'm can't do commit on this state or I'll lose my <strong>C2</strong> changes. In this case, I wanna <code>git push</code> my <strong>C3</strong> and before I can continue my working copy, I wanna merge <strong>C2</strong> and <strong>C3</strong>, but only the "changes". So, in this case, would be like these:<br>
  <code>The content is new on README.md
  add a few new lines
  add a few new lines</code></p>
  
  <p>The question why I did this, because I forgot to work on <code>add a few lines</code> first before modifying "the first line".</p>
  
  <p>I don't think <code>git revert</code> would do magic.
  Thank you very much for your attention! :)</p>
  
  <p><strong>EDIT</strong>: <code>git cherry-pick</code> would also overwritten the local changes T___T</p>