From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Feb 2018 20:31:00 GMT
Subject: Re: RFC: git squash
Message-ID: <xmqq371rtpmj.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CAA7Zk=smFOZ5+ThOZ9bfr8+UB_tD1371Oiy501sR=J4xjKdhsQ@mail.gmail.com>

Julius Musseau <julius@mergebase.com> writes:

> I'm embarrassed to realise your approach matches the top-voted
> stack-overflow answer on the subject:
> https://stackoverflow.com/a/5201642

I personally do not visit stack-overflow, but I am happy to see that
there are people who remember "right" way to do this among the folks
who do.

"reset --soft" was invented exactly for this use case, and you can
use it even with dirty working tree and dirty index (they are left
intact).