From: Junio C Hamano <gitster@pobox.com>
To: Sergey Organov <sorganov@gmail.com>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Elijah Newren" <newren@gmail.com>,
"Gábor Farkas" <gabor.farkas@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: git switch/restore, still experimental?
Date: Thu, 06 May 2021 10:39:28 +0900 [thread overview]
Message-ID: <xmqqk0oc1vzj.fsf@gitster.g> (raw)
In-Reply-To: <87sg3155dt.fsf@osv.gnss.ru> (Sergey Organov's message of "Wed, 05 May 2021 22:48:14 +0300")
Sergey Organov <sorganov@gmail.com> writes:
> Isn't --merge a different (and inferior) way to achieve what we already
> have elsewhere with --autostash? Does it make sense to get rid of --merge
> here in favor of --autostash?
Not really.
The "--autostash" might appear to be applicable to cases that can
induce larger conflict, but once the diversion gets larger than what
one comfortably can deal with "checkout -m", the user is better off
to work by forking a branch there and create a WIP commit, than deal
with the stash. So if anything, I'd rather get rid of "--autostash"
than "-m", to help users get in a better work habit.
next prev parent reply other threads:[~2021-05-06 1:39 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 10:32 git switch/restore, still experimental? Gábor Farkas
2021-05-04 19:54 ` Felipe Contreras
2021-05-05 3:46 ` Elijah Newren
2021-05-05 4:01 ` Eric Sunshine
2021-05-05 11:09 ` Ævar Arnfjörð Bjarmason
2021-05-05 17:46 ` Felipe Contreras
2021-05-05 19:26 ` Sergey Organov
2021-05-05 19:48 ` Sergey Organov
2021-05-06 1:39 ` Junio C Hamano [this message]
2021-05-06 15:19 ` Sergey Organov
2021-05-06 10:05 ` Ævar Arnfjörð Bjarmason
2021-05-06 14:29 ` Sergey Organov
2021-05-06 2:16 ` Junio C Hamano
2021-05-06 10:02 ` Ævar Arnfjörð Bjarmason
2021-05-10 11:04 ` Ævar Arnfjörð Bjarmason
2021-05-10 18:27 ` Junio C Hamano
2021-05-06 11:00 ` Felipe Contreras
2021-05-06 15:26 ` Ævar Arnfjörð Bjarmason
2021-05-06 21:55 ` Felipe Contreras
2021-05-10 10:58 ` Ævar Arnfjörð Bjarmason
2021-05-11 7:15 ` Felipe Contreras
2021-05-05 14:18 ` Johannes Schindelin
2021-05-05 14:26 ` Randall S. Becker
2021-05-06 1:15 ` Junio C Hamano
2021-05-05 17:52 ` Felipe Contreras
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk0oc1vzj.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=gabor.farkas@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=sorganov@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).