title: Squash feature branch commit after merging from master
body: <p>I am trying to squash commits in a branch to that when it is finally merged to master (after pull request if aproved) the commit history looks clean.Hence before raising the pull request I do a </p>
  
  <pre><code>git rebase -i
  </code></pre>
  
  <p>and rewrite the history.</p>
  
  <p>However while developing the feature in its branch I have to merge the content of the master onto the branch because master usually moves ahead due to other feature branches being merged.</p>
  
  <p>I see ones I merged master to feature branch I can not squash he commits any more using interactive rebase. It leads to unusual diff during pull requests i.e. changes which came as part of merges from master.</p>
  
  <p>What is the best way to squash the commits in this case?</p>