title: Rollback a Git merge
body: <pre><code>develop branch
  --&gt; dashboard (working branch)
  </code></pre>
  
  <p>I use <code>git merge --no-ff develop</code> to merge any upstream changes into dashboard</p>
  
  <p>git log:</p>
  
  <pre><code>commit 88113a64a21bf8a51409ee2a1321442fd08db705
  Merge: 981bc20 888a557
  Author: XXXX &lt;&gt;
  Date:   Mon Jul 30 08:16:46 2012 -0500
  
      Merge branch 'develop' into dashboard
  
  commit 888a5572428a372f15a52106b8d74ff910493f01
  Author: root &lt;root@magneto.giveforward.com&gt;
  Date:   Sun Jul 29 10:49:21 2012 -0500
  
      fixed end date edit display to have leading 0
  
  commit 167ad941726c876349bfa445873bdcd475eb8cd8
  Author: XXXX &lt;&gt;
  Date:   Sun Jul 29 09:13:24 2012 -0500
  </code></pre>
  
  <p>The merge had about 50+ commits in it, and I am wondering how to just revert the merge so dashboard goes back to the state pre-merge</p>
  
  <p>The second part of this is, if I dont do merge with <code>--no-ff</code>, I don't get the commit '<strong>Merge branch 'develop' into dashboard</strong>' ..  How would I roll that merge back?  </p>