title: How to maintain the history clear in git
body: <p>I have the following situation:</p>
  
  <ul>
  <li>I have 2 branches: X and Y;</li>
  <li>After some time a decided to merge them;</li>
  <li>After merging Y in X, I decided to add one more commit in X;</li>
  <li>Now, in X the last 2 commits are: 1) merge commit, 2) the second commit that I decided to add;</li>
  </ul>
  
  <p>The question is, how can I merge these 2 last commits?</p>
  
  <p>I used <code>git rebase -i HEAD~1</code>, but I can't see the merge commit. Which is the alternative? I do this for making history clear.</p>