From: greened@obbligato•org
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: git-subtree Next Round Ready
Date: Mon, 09 Apr 2012 22:34:50 -0500 [thread overview]
Message-ID: <87bon01cpx.fsf@smith.obbligato.org> (raw)
In-Reply-To: <7vobrgs5tb.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 28 Mar 2012 15:45:36 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> I think it would make more sense, from the history viewpoint, to:
>
> - Stop the history of the "subtree" branch at commit d3a04e0 (Use Test
> Harness, 2012-01-29);
>
> - Create "for-upstream" branch that is a fork of 1.7.10 (when tagged);
>
> - On "for-upstream" branch, add all the files from d3a04e0 (Use Test
> Harness, 2012-01-29) to contrib/subtree, and record it as a merge
> between 1.7.10 and d3a04e0 (you can use subtree merge for this); and
> finally
>
> - Replay the commits between d3a04e0 and the tip of your current
> "subtree" branch on top of "for-upstream".
All right, this should be ready to go.
git clone git://sources.obbligato.org/git/git.git
Branch is "for-upstream."
Also accessible via gitweb.
-Dave
next prev parent reply other threads:[~2012-04-10 3:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-25 22:06 git-subtree Next Round Ready greened
2012-03-28 22:45 ` Junio C Hamano
2012-04-01 18:00 ` greened
2012-04-10 3:34 ` greened [this message]
2012-04-10 16:02 ` Junio C Hamano
2012-04-10 18:12 ` greened
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=87bon01cpx.fsf@smith.obbligato.org \
--to=greened@obbligato$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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