title: git rebase after previous git merge
body: <p>I have the following situation:</p>
  
  <ul>
  <li>I created a <code>clone</code>(Y) from a main repository(X), because there were many people working on Y we didn't do any <code>rebase</code> but only <code>merge</code>s. When we want to deliver(<code>push</code>) Y to X we would like to do a <code>rebase</code> in order to have things nice and clean</li>
  </ul>
  
  <p>The problem is that when doing <code>rebase</code> we are asked to do all the merges that we already did in the previous <code>merge</code> steps. Is there a solution to this, beside the one that means actually re-doing the merges? </p>
  
  <p>I expected it to be pretty straightforward since we already solved the conflicting merges.</p>