title: Does git cherry-pick save any metadata?
body: <p>Given a commit that is cherry-picked into master from a branch, and later that branch is merged back into master:</p>
  
  <p>How does git know that the changes coming from the previous cherry-pick should not collide with the changes from the merge? Is any sort of metadata saved with the cherry-picked commit?</p>