title: Git: move a commit "on top"
body: <p>Let's say in <code>master</code> I have a feature disabled.
  I work on that feature on branch <code>feature</code>, so I have a special commit <code>$</code> there that just enables that feature.
  Now I want to merge the changes I did in <code>feature</code> into <code>master</code>, but keep the enabling commit out. So it's like</p>
  
  <pre><code>main:    A--B--X--Y
  feature: A--B--$--C--D
  </code></pre>
  
  <p>So let's say I want to do it, by moving the <code>$</code> commit on top of feature:</p>
  
  <pre><code>new feature: A--B--C--D--$
  </code></pre>
  
  <p>How would I go about doing that?</p>