From: Alan Chandler <alan@chandlerfamily.org.uk>
To: git@vger.kernel.org
Subject: Re: little conundrum
Date: Thu, 3 Nov 2005 22:17:14 +0000 [thread overview]
Message-ID: <200511032217.14362.alan@chandlerfamily.org.uk> (raw)
In-Reply-To: <20051103200631.GJ1431@pasky.or.cz>
On Thursday 03 Nov 2005 20:06, Petr Baudis wrote:
...
> But you actually do not want to do a merge, but:
>
> $ cd original-version
> $ cg-init
> $ cd ../modified-version
> $ cg-init
> $ cg-branch-add orig ../original-version
> $ cg-fetch orig
> $ echo `cg-object-id` `cg-object-id orig` >.git/info/grafts
very nice
I didn't know about the grafts stuff, but I can see what its doing.
--
Alan Chandler
http://www.chandlerfamily.org.uk
Open Source. It's the difference between trust and antitrust.
prev parent reply other threads:[~2005-11-03 22:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-03 17:41 little conundrum Alan Chandler
2005-11-03 17:47 ` Johannes Schindelin
2005-11-03 20:57 ` Peter Eriksen
2005-11-03 22:02 ` Alan Chandler
2005-11-04 0:41 ` Johannes Schindelin
2005-11-03 18:10 ` Peter Eriksen
2005-11-03 18:48 ` Alan Chandler
2005-11-03 19:16 ` Peter Eriksen
2005-11-03 19:30 ` Alan Chandler
2005-11-03 19:36 ` Peter Eriksen
2005-11-03 20:06 ` Petr Baudis
2005-11-03 22:17 ` Alan Chandler [this message]
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=200511032217.14362.alan@chandlerfamily.org.uk \
--to=alan@chandlerfamily.org.uk \
--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