title: Moving origin/master to HEAD instead of merging
body: <p>I have a git repository for which <code>git log --graph --all</code> gives me this a the top of the tree:</p>
  
  <pre><code>* 726523b - (HEAD, master) Clean-up in .gitignore (2013-05-23 15:46:51 +0200) &lt;Tomas Lycken&gt;
  * 5585a01 - Removed build-dependent elements (2013-05-23 15:13:16 +0200) &lt;Tomas Lycken&gt;
  | * 6d53b1c - (origin/master) Language fix (2013-05-22 22:08:26 +0200) &lt;Tomas Lycken&gt;
  |/  
  * 3e6650e - Minor changes to readme and license, after moving back to github (2013-05-22 21:29:44 +0200) &lt;Tomas Lycken&gt;
  </code></pre>
  
  <p>Now, I want to get the commit <code>6d53bc</code> into <code>master</code>, but to get the history as I want I'd prefer to cherry-pick that commit into the master branch (to avoid a merge commit and complicated branch history, when the work is really linear). But when I do that, <code>origin/master</code> still stays where it is, and I can't push any changes in <code>master</code> since the branches have diverged.</p>
  
  <p>Is there a way to merge or cherry-pick <code>6d53b1c</code> into <code>master</code> that will make the history look as if the commit was just one of the others on the same track? Essentially, this is what I want to end up with (ordering of commits is unimportant, as long as <code>master</code> and <code>origin/master</code> are in the same place):</p>
  
  <pre><code>* 726523b - (HEAD, master, origin/master) Clean-up in .gitignore (2013-05-23 15:46:51 +0200) &lt;Tomas Lycken&gt;
  * 5585a01 - Removed build-dependent elements (2013-05-23 15:13:16 +0200) &lt;Tomas Lycken&gt;
  * 6d53b1c - Language fix (2013-05-22 22:08:26 +0200) &lt;Tomas Lycken&gt;
  * 3e6650e - Minor changes to readme and license, after moving back to github (2013-05-22 21:29:44 +0200) &lt;Tomas Lycken&gt;
  </code></pre>