From: J. Bruce Fields <bfields@fieldses.org>
Date: Thu, 12 Jan 2006 00:55:32 GMT
Subject: Re: merging initial part of a branch?
Message-ID: <20060112005531.GB14599@fieldses.org>
In-Reply-To: <7vek3epbs9.fsf@assigned-by-dhcp.cox.net>

On Wed, Jan 11, 2006 at 03:47:34PM -0800, Junio C Hamano wrote:
> "J. Bruce Fields" <bfields@fieldses.org> writes:
> > External kernel projects sometimes work only against major
> > releases--it's easier for their users/testers to find a major release
> > than a random git version, and at least in the early prototype stage, it
> > isn't critical to be working on the tip all the time.
> >
> > Is there a simple way to say, for example, "merge in all the upstream
> > changes up to v2.6.15"?
> 
> I haven't tried this for some time, but I presume
> 
> 	$ git pull linus tag v2.6.15
> 
> would do what you want.

Yep!  Thanks.  The only documentation I can find for this is a slightly
obscure bit in the git-pull man page which lists this as a "short-cut"
notation.  What is it a shortcut for?  Is it possible to specify an
arbitrary commit in place of the "tag v2.6.15" somehow?

--b.