From: Andreas Ericsson <ae@op5.se>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org, "J. Bruce Fields" <bfields@fieldses.org>
Subject: Re: merging initial part of a branch?
Date: Thu, 12 Jan 2006 01:59:32 +0100 [thread overview]
Message-ID: <43C5A9F4.1040604@op5.se> (raw)
In-Reply-To: <7vu0cai98f.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
> Andreas Ericsson <ae@op5.se> writes:
>
>
>>Junio C Hamano wrote:
>>
>>
>>>I haven't tried this for some time, but I presume
>>> $ git pull linus tag v2.6.15
>>>would do what you want.
>>
>>If it doesn't you might be able to do
>>
>>$ git format-patch -m -k v2.6.14..v2.6.15 --stdout > mega-mbox-patch
>>$ git checkout our-own-branch
>>$ git am -3 -k mega-mbox-patch
>>
>>That'll take some time though, so be sure to have a six-pack or two handy.
>
>
> I do not think that should be done. You will create an
> alternate history that way, not the true v2.6.15 history.
>
I took their request to mean that they already have patches of their own
in that, so they'll never have v2.6.15 vanilla history anyway.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
next prev parent reply other threads:[~2006-01-12 0:59 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 [this message]
2006-01-12 1:13 ` J. Bruce Fields
2006-01-12 0:55 ` J. Bruce Fields
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43C5A9F4.1040604@op5.se \
--to=ae@op5.se \
--cc=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.
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 NNTP newsgroup(s).