From: Alan Chandler Date: Thu, 10 Nov 2005 19:15:53 GMT Subject: Re: Do I misunderstand cg-merge --squash option 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. > > 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.