title: Merging the changes included by only one commit in my branch?
body: <p>I use to work with a partner and each of us works in a parallel branch.</p>
  
  <p>Sometimes, I want to merge some change that he have commited but I do not want to merge all the commits that are in his branch.</p>
  
  <p>If I merge his branch, I will merge the commit that is pointed out by his branch and all this ancestors. It is not I want.</p>
  
  <p>If I merge a specific commit, I will merge that commit and all this ancestors. It is not I want.</p>
  
  <p>How can I merge the changes included by only one commit in my branch without merging his ancestors?</p>
  
  <p>Explanation: My partner works in their files and I work in mine. But sometimes, one of us changes a file that is common for both, so we need to merge only the change that was made in the commom file.</p>