From: greened@obbligato.org
To: Herman van Rink <rink@initfour.nl>
Cc: dag@cray.com, Hilco Wijbenga <hilco.wijbenga@gmail.com>,
Git Users <git@vger.kernel.org>
Subject: Re: Subtree in Git
Date: Thu, 03 May 2012 21:26:54 -0500 [thread overview]
Message-ID: <87fwbgbs0h.fsf@smith.obbligato.org> (raw)
In-Reply-To: <4F9FA029.7040201@initfour.nl> (Herman van Rink's message of "Tue, 01 May 2012 10:34:49 +0200")
Herman van Rink <rink@initfour.nl> writes:
>> We don't know right now. I want to take a look at Herman's patches
>> first but have been delayed for various reasons. I hope to get to that
>> this weekend. I also want to get at least one release under our belt.
>
> I've worked on this a bit over the weekend.
>
> I've forked the main git repo on github to merge my tree on top of that.
>
> I basically did a: git subtree merge --prefix=contrib/subtree <my
> git-subtree branch>
>
> The work in progress in on: https://github.com/helmo/git (the
> subtree-updates branch)
This branch seems to have a bunch of commits from master or some other
branch:
on master:
git log subtree-updates --not HEAD
[...some git-subtree stuff...]
commit 10d4332e007132a38dc61f03c760d355da5cd550
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Apr 29 18:00:47 2012 -0700
The seventh batch of topics graduated to 'master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a75aba4a5306d0fee6a8ee8b48943e2c19eb2750
Merge: 55375e9 46e3581
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Apr 29 17:52:02 2012 -0700
Merge branch 'js/daemon-test-race-fix'
[...]
Perhaps I'm doing something wrong. Or does the subtree-updates branch
need to be refreshed?
-Dave
next prev parent reply other threads:[~2012-05-04 2:31 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 [this message]
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
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fwbgbs0h.fsf@smith.obbligato.org \
--to=greened@obbligato.org \
--cc=dag@cray.com \
--cc=git@vger.kernel.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).