All of lore.kernel.org
 help / color / mirror / Atom feed
From: <dag@cray.com>
To: Herman van Rink <rink@initfour.nl>
Cc: Junio C Hamano <gitster@pobox.com>, <greened@obbligato.org>,
	Hilco Wijbenga <hilco.wijbenga@gmail.com>,
	Git Users <git@vger.kernel.org>
Subject: Re: Subtree in Git
Date: Mon, 7 May 2012 16:57:16 -0500	[thread overview]
Message-ID: <nngzk9jvemb.fsf@transit.us.cray.com> (raw)
In-Reply-To: <4FA82799.1020400@initfour.nl> (Herman van Rink's message of "Mon, 7 May 2012 21:50:49 +0200")

Herman van Rink <rink@initfour.nl> writes:

> As an alternative I've now applied a patch with all changes on a clean
> master branch.
> In the commit message I've named all committers from the original history.
> Would that be acceptable?

Seems ok to me but Junio has the final say.

> Its now available as https://github.com/helmo/git/tree/subtree-updates
> The subtree merge version is still available as
> https://github.com/helmo/git/tree/subtree-updates-merged

Cool.  I'll take a look, probably Wednesday at the earliest.

                            -Dave

  reply	other threads:[~2012-05-07 22:01 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
2012-05-07 19:50         ` Herman van Rink
2012-05-07 21:57           ` dag [this message]
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=nngzk9jvemb.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.