title: How to merge back cherry-picked commits in git?
body: <p>I have 2 main branches <code>master</code> and <code>development</code>. I recently had to push a hotfix that are commits already merged to <code>development</code>, and to do so I cherry-picked commits from <code>development</code>, created a new hotfix branch, added another commit for the fix, and merged that to <code>master</code>. My question is, how can I now merge the new commit to <code>development</code> without messing up the git commit history?</p>
  
  <p>Roughly, what I did:</p>
  
  <pre><code>git cherry-pick &lt;commit SHA&gt;
  git checkout -b hotfix-branch
  [make more changes]
  git commit -m "Fix issue"
  git checkout master
  git merge hotfix-branch
  </code></pre>
  
  <p>Now, if I look at <code>git diff</code> between <code>master</code> and <code>development</code>, the old commits from <code>development</code> is showing up because they're cherrypicked, therefore different commits with the same changes. What is the best way to merge back to <code>development</code> and "fix" these diff?</p>
  
  <p>Edit to add: Alternatively, what should I have done in a situation like this, where a hotfix consists of commits in <code>development</code> branch?</p>