From: greened@obbligato.org
Date: Tue, 10 Apr 2012 03:34:50 GMT
Subject: Re: git-subtree Next Round Ready
Message-ID: <87bon01cpx.fsf@smith.obbligato.org>
In-Reply-To: <7vobrgs5tb.fsf@alter.siamese.dyndns.org>

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