Re: [bug report]: error doing_rebase

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 6, 2018, 09:47 UTC
Message-ID: <nycvar.QRO.7.76.6.1802061045160.35@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
In-Reply-To: <d4246fa9-5ca2-33c9-d7b6-07adfd9b55a6@yandex.ru>

Hi,

On Mon, 5 Feb 2018, Bulat Musin wrote:

Show 7 quoted lines

> Now there are 3 sequential commits, I want to squash them into 1:
> 
> git rebase -i HEAD~2
> 
> In editor I changed all "pick" to "squash", saved file, I got:
> 
> error: cannot 'squash' without a previous commit

You cannot start with a squash. You have to pick the first one, then squash the second into the first.

> However, 2.14.1 from Ubuntu's repo does the job - squashes 3 commits into 1.

It may be careless enough to do that, however, it might now have modified the *wrong* commit, i.e. squashed the two patches *into HEAD~2*.

Please verify that your HEAD~2 is still intact and part of the rebased history, otherwise you will have a problem.

Ciao, Johannes