Date: Thu, 24 Jul 2008 19:10:20 -0400 (EDT)
From: Daniel Barkalow <barkalow@iabervon.org>
To: Jack Howarth <howarth@bromo.msbb.uc.edu>
cc: linux-kernel@vger.kernel.org
Subject: Re: merging branches remotely with git?
In-Reply-To: <20080724224801.GA32241@bromo.msbb.uc.edu>
Message-ID: <alpine.LNX.1.00.0807241904210.19665@iabervon.org>
References: <20080724173030.GA7609@bromo.msbb.uc.edu> <alpine.LNX.1.00.0807241453470.19665@iabervon.org> <20080724224801.GA32241@bromo.msbb.uc.edu>
User-Agent: Alpine 1.00 (LNX 882 2007-12-20)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1233
Lines: 33

On Thu, 24 Jul 2008, Jack Howarth wrote:

> Daniel,
>    If I execute...
> 
> git clone git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/my-wireless-testing.git
> cd my-wireless-testing
> git pull git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> 
> I get the error...
> 
> You asked me to pull without telling me which branch you
> want to merge with, and 'branch.master.merge' in
> your configuration file does not tell me either.

Ah, sorry. Add " master" to the end of that.

> ps Which git represents the git patches (like 2.6.26-git11) which are
> placed as patches on the www.kernel.org web page under the section
> The latest snapshot for the stable Linux kernel tree is:.

Those come from the current state of the master branch of the 
...torvalds/linux-2.6 repository as of when they're made, but I don't know 
how to figure out what -git11 is, as opposed to -git10 or any of the 
commits done in between.

	-Daniel
*This .sig left intentionally blank*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/