In Git, how to merge (not checkout) part of files from a long ago branch
<p>Like <strong>Fig.A</strong>, <code>release-1.0</code> is delivered to customer long long ago, but a huge bug was found recently, and a hotfix is made in <code>release-1.1</code> and re-delivered. </p>

<p>Now I would like to merge <strong>only bugfix files</strong> (about 10 files) from <code>release-1.1</code> into branch <code>master</code> in <code>Fig.B</code> way, that is, <code>release-1.1</code> <strong>must</strong> be a parent-node of <code>master</code> in git history. So <code>git checkout release-1.1 &lt;file&gt;</code> way does not match this purpose.</p>

<p>Meanwhile, since <code>c2</code> is so far from <code>master</code>, there are too many different files (nearly hundreds files that can not merge automatically), and the work of canceling these merge conflicts may kill me....</p>

<p>So how could I realize this purpose in git? Sorry for my poor English and poor git skills. ^_^</p>

<p>Fig A:</p>

<pre><code>    release-1.0 &lt;--- release-1.1                          
        |                                                              
        v                                                           
c1 &lt;--- c2 &lt;--- c3 &lt;--- c4 &lt;--- c5 &lt;--- c6 &lt;--- master
</code></pre>

<p>Fig B:</p>

<pre><code>    release-1.0 &lt;--- release-1.1 &lt;----------------------\
        |                                               |       
        v                                               |       
c1 &lt;--- c2 &lt;--- c3 &lt;--- c4 &lt;--- c5 &lt;--- c6 &lt;--- c7 &lt;--- master
</code></pre>