Re: git question

[Tirtha Ghosh <gtirtha@xxxxxxxxx>]

if you want to merge the whole branch..use git merge (
http://book.git-scm.com/3_basic_branching_and_merging.html ). You might get some conflicts..resolve them, add them and continue with git merge.

On other hands, if you want to get only some of the commits and not the whole branch...you can use git cherry-pick ( http://wiki.koha-community.org/wiki/Using_Git_Cherry_Pick ). You still might get some conflicts..resolve and add them and use "git commit -c <commit id>"

Links provided are good to follow.

regards,

Tirtha

On Tue, Jan 24, 2012 at 4:32 AM, chromaticwt zac <zac.3.14159@xxxxxxxxx> wrote:

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?

_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@xxxxxxxxxxxxxxxxx
http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies

_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@xxxxxxxxxxxxxxxxx
http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies