From: Junio C Hamano <gitster@pobox.com>
To: Julius Musseau <julius@mergebase.com>
Cc: git@vger.kernel.org
Subject: Re: RFC: git squash
Date: Fri, 23 Feb 2018 12:31:00 -0800 [thread overview]
Message-ID: <xmqq371rtpmj.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CAA7Zk=smFOZ5+ThOZ9bfr8+UB_tD1371Oiy501sR=J4xjKdhsQ@mail.gmail.com> (Julius Musseau's message of "Fri, 23 Feb 2018 09:03:30 -0800")
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).
prev parent reply other threads:[~2018-02-23 20:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-23 3:41 RFC: git squash Julius Musseau
2018-02-23 6:04 ` Junio C Hamano
2018-02-23 17:03 ` Julius Musseau
2018-02-23 20:31 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq371rtpmj.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=julius@mergebase.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).