From: <dag@cray.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: <greened@obbligato.org>, Herman van Rink <rink@initfour.nl>,
Hilco Wijbenga <hilco.wijbenga@gmail.com>,
Git Users <git@vger.kernel.org>
Subject: Re: Subtree in Git
Date: Mon, 7 May 2012 10:21:08 -0500 [thread overview]
Message-ID: <nng8vh4yq3f.fsf@transit.us.cray.com> (raw)
In-Reply-To: <7v8vh78dag.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Fri, 4 May 2012 21:25:27 -0700")
Junio C Hamano <gitster@pobox.com> writes:
>> This branch seems to have a bunch of commits from master or some other
>> branch:
>
> Isn't the confusing shape of the history a direct result of what Herman
> said he did above, i.e. use of "subtree merge"? I thought that we agreed
> not to do any more subtree merges for further updates when we slurped the
> subtree history to contrib/ early in this cycle, so if that is the case,
> Herman needs to rebase his work so that the integration will not need any
> "subtree merge" into git.git, perhaps?
I think you're right.
> In short, it is a mess.
I agree. I think Herman is working to fix it. A rebase and rework of
the patch set would be very helpful.
> Not very impressed, but I have this suspition that the history I was
> looking at was not what was meant to be sent to me and an older
> incarnation of the project before Herman cleaned it up for public
> consumption, or something.
That's the impression I got as well.
I haven't had a chance to look at Herman's latest tree.
-Dave
next prev parent reply other threads:[~2012-05-07 15:22 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-27 18:48 Subtree in Git Hilco Wijbenga
2012-04-27 20:38 ` dag
2012-04-27 21:09 ` Hilco Wijbenga
2012-05-01 8:34 ` Herman van Rink
2012-05-04 2:26 ` greened
2012-05-04 10:08 ` Herman van Rink
2012-05-05 4:25 ` Junio C Hamano
2012-05-07 15:21 ` dag [this message]
2012-05-07 19:50 ` Herman van Rink
2012-05-07 21:57 ` dag
2012-05-11 20:24 ` Junio C Hamano
2012-05-23 15:13 ` dag
2012-06-12 1:30 ` greened
2012-06-13 13:20 ` Herman van Rink
2012-07-11 16:14 ` dag
2012-10-20 20:03 ` Herman van Rink
2012-10-21 6:32 ` Junio C Hamano
2012-10-21 15:09 ` Herman van Rink
2012-10-21 19:51 ` Junio C Hamano
2012-10-21 20:23 ` Herman van Rink
2012-10-22 14:47 ` dag
2012-10-22 14:44 ` dag
2012-10-22 14:41 ` dag
2012-10-26 13:10 ` Herman van Rink
2012-10-26 13:58 ` David Michael Barr
2012-10-26 16:54 ` James Nylen
2012-10-29 15:55 ` dag
2013-03-01 2:28 ` Kindjal
2013-03-01 22:05 ` Paul Campbell
2013-03-02 11:21 ` David Michael Barr
2013-03-02 17:43 ` Paul Campbell
2013-03-04 22:33 ` Paul Campbell
2012-10-29 15:53 ` dag
2012-05-04 22:50 ` Daniel Koester
2012-06-12 1:32 ` 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=nng8vh4yq3f.fsf@transit.us.cray.com \
--to=dag@cray.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=greened@obbligato.org \
--cc=hilco.wijbenga@gmail.com \
--cc=rink@initfour.nl \
/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).