From: Sven Axelsson <sven.axelsson@gmail.com>
To: emacs-devel@gnu.org
Subject: Re: The Gnus repository is switching to Git as of 2010-04-19
Date: Wed, 21 Apr 2010 13:38:11 +0200 [thread overview]
Message-ID: <r2xa17030f01004210438wf10238edif7eefc88bbc27689@mail.gmail.com> (raw)
In-Reply-To: <87zl0xlajm.fsf@uwakimon.sk.tsukuba.ac.jp>
On 21 April 2010 06:00, Stephen J. Turnbull <stephen@xemacs.org> wrote:
> You've managed what is conceptually a single body of content, using
> two separate trees, both actively developed, with persistently
> different names for the same file(s), and bidirectional merging?
I admit not being completely clear on the implications here, but maybe
you want to look into the subtree merge strategy for git. Some
information here:
http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html.
It is intended for this kind uf usage.
--
Sven Axelsson
++++++++++[>++++++++++>+++++++++++>++++++++++>++++++
>++++<<<<<-]>++++.+.++++.>+++++.>+.<<-.>>+.>++++.<<.
+++.>-.<<++.>>----.<++.>>>++++++.<<<<.>>++++.<----.
next prev parent reply other threads:[~2010-04-21 11:38 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-19 17:34 The Gnus repository is switching to Git as of 2010-04-19 Ted Zlatanov
2010-04-20 13:03 ` Harry Putnam
2010-04-20 13:29 ` Ted Zlatanov
2010-04-20 13:57 ` Andreas Schwab
[not found] ` <jwvr5mb8evr.fsf-monnier+emacs@gnu.org>
2010-04-20 13:55 ` Ted Zlatanov
2010-04-20 15:00 ` Stefan Monnier
2010-04-20 20:05 ` Ted Zlatanov
2010-04-20 22:28 ` Stefan Monnier
2010-04-20 23:44 ` Ted Zlatanov
2010-04-21 3:16 ` Stefan Monnier
2010-04-21 11:03 ` Gnus Git synchronization with Emacs Bazaar (was: The Gnus repository is switching to Git as of 2010-04-19) Ted Zlatanov
2010-04-22 2:24 ` Stephen J. Turnbull
2010-04-21 0:33 ` The Gnus repository is switching to Git as of 2010-04-19 Stephen J. Turnbull
2010-04-21 0:51 ` Ted Zlatanov
2010-04-21 3:31 ` Stephen J. Turnbull
2010-04-21 3:11 ` Stefan Monnier
2010-04-21 4:00 ` Stephen J. Turnbull
2010-04-21 11:38 ` Sven Axelsson [this message]
2010-04-21 9:01 ` Andreas Schwab
2010-04-21 2:59 ` Teemu Likonen
2010-04-21 11:30 ` Ævar Arnfjörð Bjarmason
2010-04-21 14:57 ` Teemu Likonen
2010-04-21 16:36 ` Ævar Arnfjörð Bjarmason
2010-04-22 5:49 ` Harry Putnam
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: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=r2xa17030f01004210438wf10238edif7eefc88bbc27689@mail.gmail.com \
--to=sven.axelsson@gmail.com \
--cc=emacs-devel@gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.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).