title: How do I apply the result of my recent commits to another branch, without merging all other differences?
body: <p>I have two branches: </p>
  
  <p><code>master</code> and <code>translation</code> </p>
  
  <p>Basically, <code>translation</code> is the same, but all strings are in Spanish, instead of English. </p>
  
  <p>I worked on some new features on my <code>master</code> branch, and I would like to have these features on my <code>translation</code> branch also. </p>
  
  <p>But how do I do this without overwriting all my spanish strings with english strings? </p>
  
  <p>Is it <code>cherry-pick</code>? And do I have other options, where I do not loose merging functionality, like <a href="https://stackoverflow.com/users/36723/bdonlan">bdonlan</a>'s answer on <a href="https://stackoverflow.com/questions/881092/how-to-merge-a-specific-commit-in-git">how to merge a specific commit in Git</a>?</p>