title: rewrite origin history with upstream history?
body: <p>I'm working on a large team, and the team regularly squashes commits to the upstream. At this point, my origin's history is different enough from upstreams, that the only way to "sync" them up anymore, is to reset to upstream and force push to origin.</p>
  
  <p>Is there a way to "sync" or rewrite my origin's history with upstreams, to get rid of the "mini" commits on mine, and replace them with the squashed ones from upstream?</p>