git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: little conundrum

From
Alan Chandler <alan@chandlerfamily.org.uk>
Date
Nov 3, 2005, 22:17 UTC
Message-ID
<200511032217.14362.alan@chandlerfamily.org.uk>
In-Reply-To
<20051103200631.GJ1431@pasky.or.cz>

On Thursday 03 Nov 2005 20:06, Petr Baudis wrote: ...

Show 9 quoted lines
> 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.
Previous: Petr Baudis
Message 12 of 12 in “little conundrum”
  1. Alan ChandlerNov 3, 2005
  2. Johannes SchindelinNov 3, 2005
  3. Peter EriksenNov 3, 2005
  4. Alan ChandlerNov 3, 2005
  5. Johannes SchindelinNov 4, 2005
  6. Peter EriksenNov 3, 2005
  7. Alan ChandlerNov 3, 2005
  8. Peter EriksenNov 3, 2005
  9. Alan ChandlerNov 3, 2005
  10. Peter EriksenNov 3, 2005
  11. Petr BaudisNov 3, 2005
  12. Alan ChandlerNov 3, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.