title: How to merge into branch without commit?
body: <p>Let's say I have <code>branch1</code> and I created a new <code>branch2</code> off of it. I commit twice to <code>branch2</code>. How do I mege branch2 back down to <code>branch1</code> without any evidence of <code>branch2</code> existing?</p>
  
  <p>Diagram:</p>
  
  <p>Initial state:</p>
  
  <pre><code>                  E---F  branch2
               /
  A---B---C---D  branch1
  </code></pre>
  
  <p>Wanted state:</p>
  
  <pre><code>A---B---C---D---E---F  branch1
  </code></pre>
  
  <p>But instead I get something like this:</p>
  
  <pre><code>A---B---C---D---E---F---(M)  branch1 with extra Merge Commit
  </code></pre>
  
  <p>Note: I'm using Intellij IDEA to do my git commands.</p>