From: "J. Bruce Fields" <bfields@fieldses.org>
To: Junio C Hamano <junkio@cox.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: merging initial part of a branch?
Date: Wed, 11 Jan 2006 19:55:32 -0500 [thread overview]
Message-ID: <20060112005531.GB14599@fieldses.org> (raw)
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.
next prev parent reply other threads:[~2006-01-12 0:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-11 23:04 merging initial part of a branch? J. Bruce Fields
2006-01-11 23:47 ` Junio C Hamano
2006-01-12 0:15 ` Andreas Ericsson
2006-01-12 0:24 ` Junio C Hamano
2006-01-12 0:59 ` Andreas Ericsson
2006-01-12 1:13 ` J. Bruce Fields
2006-01-12 0:55 ` J. Bruce Fields [this message]
2006-01-12 1:47 ` Junio C Hamano
2006-01-13 3:08 ` J. Bruce Fields
2006-01-13 4:00 ` Junio C Hamano
2006-01-13 15:10 ` J. Bruce Fields
2006-01-13 19:50 ` Junio C Hamano
2006-01-13 20:01 ` J. Bruce Fields
[not found] ` <20060115185458.GA3985@fieldses.org>
2006-01-15 23:26 ` [PATCH] new tutorial Junio C Hamano
2006-01-16 3:57 ` J. Bruce Fields
2006-01-16 5:32 ` Junio C Hamano
2006-01-23 4:57 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060112005531.GB14599@fieldses.org \
--to=bfields@fieldses.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).