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, 19:15 UTC
Message-ID
<200511101915.53736.alan@chandlerfamily.org.uk>
In-Reply-To
<20051110101206.GP30496@pasky.or.cz>
On Thursday 10 Nov 2005 10:12, Petr Baudis wrote:
>
> Why do you want to do a squash merge?
>

I used git experimentally as I built a web application from scratch, learning both what I wanted the application to look like and how to do it with the packages I was using. There is several hundreds of commits that are totally irrelevant (both because they were all different directions I was trying and then backing out of and because I saved state just were I was when I gave up for the day).

So what I was experimenting with was whether I could somehow get rid of that history (at least in one branch) before making that history public.

Show 5 quoted lines
>
> I told you in the documentation - "re-merging with that branch later
> will cause trouble". If you want to be able to re-merge the branch
> later, you shouldn't use squash merge. And you shouldn't use squash
> merge anyway, expect for few narrow use cases.

I know - I saw the warning - and I was only experimenting. I just didn't understand what had happened.

I am now experimenting with another approach using grafts etc. But I will post on that seperately, so as not to confuse titles of the e-mail thread.

-- 
Alan Chandler
http://www.chandlerfamily.org.uk
Open Source. It's the difference between trust and antitrust.
Previous: Petr BaudisNext: Petr Baudis
Message 3 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.