git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: greened@obbligato.org
To: git@vger.kernel.org
Subject: git-subtree Next Round Ready
Date: Sun, 25 Mar 2012 17:06:06 -0500	[thread overview]
Message-ID: <87398we3ox.fsf@smith.obbligato.org> (raw)

Ok, I've cleaned things up with git-subtree so the changes I had to the
test infrastructure are gone.  No changes to upstream are needed to
support git-subtree in contrib/ now.

As usual, the branches are here:

git://sources.obbligato.org/git/git.git

gitweb here: http://sources.obbligato.org/?p=git.git;a=summary

There are three branches.  master is the usual.  "subtree-latest" is my
version of git-subtree cleaned up for upstreaming into contrib/.  This
is the pure git-subtree history, ready to be subtree merged.
"subtree-integrated" is a version of upstream git.git with
subtree-latest merged as a subtree (done via git-subtree!).

I assume it will be easier to have Junio or another integrator do the
subtree merge from subtree-latest in his or her workarea but I provide
subtree-integrated so everyone can easily check out what it will look
like.

Let me know of anything else you need.

Thanks!

                         -Dave

             reply	other threads:[~2012-03-25 22:10 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-25 22:06 greened [this message]
2012-03-28 22:45 ` git-subtree Next Round Ready Junio C Hamano
2012-04-01 18:00   ` greened
2012-04-10  3:34   ` greened
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=87398we3ox.fsf@smith.obbligato.org \
    --to=greened@obbligato.org \
    --cc=git@vger.kernel.org \
    /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).