From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Jul 2008 08:53:55 GMT
Subject: Re: git merge --squash isn't "marked as a merge"??
Message-ID: <7vbq0hhxzw.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <488ECB89.5060801@sneakemail.com>

"Peter Valdemar Mørch (Lists)"  <4ux6as402@sneakemail.com> writes:

> Newbie alert:
>
> I have a feature branch where I have N tiny commits with sloppy/private
> commit messages....

Probably you would want to step back and _think_ why you want to squash in
the first place.  I suspect the answer would lead to a better use of the
available set of tools, such as "use 'rebase -i' to clean up the original
history and then 'merge' (without squash) it or 'rebase' it".