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

Re: Do I misunderstand cg-merge --squash option

From
Alan Chandler <alan@chandlerfamily.org.uk>
Date
Nov 10, 2005, 20:36 UTC
Message-ID
<200511102036.06484.alan@chandlerfamily.org.uk>
In-Reply-To
<20051110192923.GT30496@pasky.or.cz>
On Thursday 10 Nov 2005 19:29, Petr Baudis wrote:
>
> Right now, what about trying to manually select the merge base?
>
> 	public$ cg-merge -b v1.0 master

Actually, that does merge very nicely. However, I don't think its what I want. From gitk I get both routes back to my initial commit, both the fast track one and the slow train via all stations en-route.

I have had more success with grafting (which you kindly informed me about yesterday)

something like
echo `cg-object-id v1.0` `cg-object-id initial_commit` >.git/info/grafts

lf I make a branch out of the parent of v1.0 before doing this, I end up with there being a side branch of the old history and my master branch headed back through a quick route to the initial_commit.

Something strange (well actually not that unexpected, the more I think about it) has happened though.

I was trying to see if cg-clone would effectively me make a new repository without the grafts in it (ie with real commit object with a parent as specified via the graft) but it doesn't - it just looses the graft and rebrings all the old history back in

Is that a bug?
-- 
Alan Chandler
http://www.chandlerfamily.org.uk
Open Source. It's the difference between trust and antitrust.
Previous: Petr BaudisNext: Petr Baudis
Message 5 of 6 in “Do I misunderstand cg-merge --squash option”
  1. Alan ChandlerNov 10, 2005
  2. Petr BaudisNov 10, 2005
  3. Alan ChandlerNov 10, 2005
  4. Petr BaudisNov 10, 2005
  5. Alan ChandlerNov 10, 2005
  6. Petr BaudisNov 10, 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.