if you want to merge the whole branch..use git merge (
<a href="http://book.git-scm.com/3_basic_branching_and_merging.html">http://book.git-scm.com/3_basic_branching_and_merging.html</a> ). You might get some conflicts..resolve them, add them and continue with git merge.<div>
<br></div><div>On other hands, if you want to get only some of the commits and not the whole branch...you can use git cherry-pick (
<a href="http://wiki.koha-community.org/wiki/Using_Git_Cherry_Pick">http://wiki.koha-community.org/wiki/Using_Git_Cherry_Pick</a> ). You still might get some conflicts..resolve and add them and use "git commit -c <commit id>"</div>
<div><br></div><div>Links provided are good to follow.</div><div><br></div><div>regards,</div><div>Tirtha<br><br><div class="gmail_quote">On Tue, Jan 24, 2012 at 4:32 AM, chromaticwt zac <span dir="ltr"><<a href="mailto:zac.3.14159@gmail.com">zac.3.14159@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I have a git question regarding the linux kernel. I have cloned linux-stable. I want to merge fs/btrfs from another tree into my linux-stable repo. how can I do this?<br>
<br>_______________________________________________<br>
Kernelnewbies mailing list<br>
<a href="mailto:Kernelnewbies@kernelnewbies.org">Kernelnewbies@kernelnewbies.org</a><br>
<a href="http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies" target="_blank">http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies</a><br>
<br></blockquote></div><br></div>