title: Messed up a merge when trying to upgrade my Laravel application
body: <p>I have an existing laravel project which used an older version of Laravel 5.1. I wanted to upgrade my project to use Laravel 5.1.2. </p>
  
  <p>I followed <a href="http://viget.com/extend/keeping-the-framework-for-your-application-up-to-date-with-git" rel="nofollow">this</a> tutorial. So I added the <code>laravel/laravel</code> github repository into my git project as a remote called <code>laravel</code>, fetched it, then I created a new local branch named <code>framework</code> using <code>laravel/master</code> as the remote.</p>
  
  <p>Then I switched back to my <code>develop</code> branch, ran <code>git merge framework</code> and fixed all the conflicts, then I ran <code>git commit -m "Upgrade to Laravel 5.1.2" &amp;&amp; git push</code></p>
  
  <p>Now here comes the problem, after I pushed I noticed my <code>develop</code> branch got <strong>all</strong> the commits (over 4000) from the laravel/laravel project, which I really do not want littering my git log. Is there any way to not have to add all the commits from the framework, but only the "Upgrade to Laravel 5.1.2" message? Is it possible to fix this afterwards anymore? </p>
  
  <p>EDIT:
  Okay, I managed to fix my current commit history like this:
  <code>
  git reset --soft HEAD~1
  git commit -am "...."
  git push --force
  </code></p>
  
  <p><strong>but</strong> I have no idea how it magically got fixed with that, and how can I in the future avoid littering my commit history when merging a big remote repository</p>