Git question

2010-08-24 Thread Steve Dickson
Hello, How I merge the latests changes from the remotes/origin/f13/master on to my f13/user/steved/pnfs-13 remote branch? Also, the kernel that is currently being built from my pnfs-13 branch fails to install with the following error: FATAL: Could not load

Re: Git question

2010-08-24 Thread Stephen Gallagher
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 08/24/2010 08:55 AM, Steve Dickson wrote: Hello, How I merge the latests changes from the remotes/origin/f13/master on to my f13/user/steved/pnfs-13 remote branch? The easiest way would be to switch to the pnfs-13 branch and then do: git

Re: Git question

2010-08-24 Thread Jochen Schmitt
Am 24.08.10 14:55, schrieb Steve Dickson: How I merge the latests changes from the remotes/origin/f13/master on to my f13/user/steved/pnfs-13 remote branch? I think git cherry-pick is the command whar you want to use. With git cherry-pck you can apply the changes of a commit from an other

Re: Git question

2010-08-24 Thread Andy Shevchenko
On Tue, Aug 24, 2010 at 4:21 PM, Jochen Schmitt joc...@herr-schmitt.de wrote:  Am 24.08.10 14:55, schrieb Steve Dickson: How I merge the latests changes from the remotes/origin/f13/master on to my f13/user/steved/pnfs-13 remote branch? I think git cherry-pick is the command whar you want to

Re: Git question

2010-08-24 Thread Steve Dickson
On 08/24/2010 09:16 AM, Stephen Gallagher wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 08/24/2010 08:55 AM, Steve Dickson wrote: Hello, How I merge the latests changes from the remotes/origin/f13/master on to my f13/user/steved/pnfs-13 remote branch? The easiest way

Re: Git question

2010-08-24 Thread Steve Dickson
On 08/24/2010 09:27 AM, Andy Shevchenko wrote: On Tue, Aug 24, 2010 at 4:21 PM, Jochen Schmitt joc...@herr-schmitt.de wrote: Am 24.08.10 14:55, schrieb Steve Dickson: How I merge the latests changes from the remotes/origin/f13/master on to my f13/user/steved/pnfs-13 remote branch? I

Re: Git question

2010-08-24 Thread M A Young
On Tue, 24 Aug 2010, Steve Dickson wrote: Also, the kernel that is currently being built from my pnfs-13 branch fails to install with the following error: FATAL: Could not load /lib/modules/2.6.34.5-43.pnfs_all_2.6.35_2010_08_19.fc13.x86_64-pnfs/modules.dep: No such file or directory

Re: Git question

2010-08-24 Thread M A Young
On Tue, 24 Aug 2010, Steve Dickson wrote: On 08/24/2010 10:46 AM, M A Young wrote: On Tue, 24 Aug 2010, Steve Dickson wrote: Also, the kernel that is currently being built from my pnfs-13 branch fails to install with the following error: FATAL: Could not load

Re: Git question

2010-08-24 Thread Steve Dickson
On 08/24/2010 01:55 PM, M A Young wrote: On Tue, 24 Aug 2010, Steve Dickson wrote: On 08/24/2010 10:46 AM, M A Young wrote: On Tue, 24 Aug 2010, Steve Dickson wrote: Also, the kernel that is currently being built from my pnfs-13 branch fails to install with the following error:

Re: Git question

2010-08-24 Thread Steve Dickson
On 08/24/2010 02:08 PM, Steve Dickson wrote: On 08/24/2010 01:55 PM, M A Young wrote: On Tue, 24 Aug 2010, Steve Dickson wrote: On 08/24/2010 10:46 AM, M A Young wrote: On Tue, 24 Aug 2010, Steve Dickson wrote: Also, the kernel that is currently being built from my pnfs-13 branch