[leaf-devel] Bering-uClibc next

2012-03-04 Thread KP Kirchdoerfer
Hi; FYI: gatekeeper# uname -a Linux gatekeeper 3.2.6-geode #1 Wed Feb 29 17:22:09 CET 2012 i586 GNU/Linux gatekeeper# w 16:49:09 up 1 day, 21:31, 1 users, load average: 0.00, 0.01, 0.04 rootttyS0 00:00 Mar 2 20:16:03 It runs everything I need for daily use: WLAN with

Re: [leaf-devel] git merge mybranch with next?

2012-03-04 Thread KP Kirchdoerfer
Am 04.03.2012 16:09, schrieb Andrew: > 04.03.2012 16:07, KP Kirchdoerfer пишет: >> Hi; >> >> I know, how I can merge a branch with master. >> >> But how do I merge a branch with another one, "next" in my case? >> >> thx kp > Just do 'git merge ' - object can be branch, tag, commit, and > your curr

Re: [leaf-devel] git merge mybranch with next?

2012-03-04 Thread Andrew
04.03.2012 16:07, KP Kirchdoerfer пишет: > Hi; > > I know, how I can merge a branch with master. > > But how do I merge a branch with another one, "next" in my case? > > thx kp Just do 'git merge ' - object can be branch, tag, commit, and your current branch will have all mods from other branch ti

Re: [leaf-devel] git merge mybranch with next?

2012-03-04 Thread Mike Noyes
On 03/04/2012 06:07 AM, KP Kirchdoerfer wrote: > Hi; > > I know, how I can merge a branch with master. > > But how do I merge a branch with another one, "next" in my case? KP, I'll likely show my git ignorance with this post. Please verify my comments/suggestions below with Andrew before you do a

[leaf-devel] git merge mybranch with next?

2012-03-04 Thread KP Kirchdoerfer
Hi; I know, how I can merge a branch with master. But how do I merge a branch with another one, "next" in my case? thx kp -- Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtual