From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: Michael Migdol <michael-spam@migdol•net>, git@vger•kernel.org
Subject: Re: stash-p broken?
Date: Thu, 31 Jul 2014 09:49:41 -0700 [thread overview]
Message-ID: <xmqqbns5xyl6.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140731002321.GD22297@peff.net> (Jeff King's message of "Wed, 30 Jul 2014 20:23:21 -0400")
Jeff King <peff@peff•net> writes:
> Hmph. To be honest, I am starting to wonder if implying "--first-parent"
> is a more sensible option for "stash list". It matches "stash show", at
> least, and it is not unreasonable to simply present the changes in the
> working tree by default, and ignore the index. People who are more
> clueful can pick apart the commits using "git log" themselves.
Yup, I tend to agree.
After thinking about this a lot, I really wish that we did not have
"stash apply" and "stash pop", but just "stash save" and a single
"stash restore" that either checks out the original branch (if its
head have not moved) or detaches the HEAD at the original commit
(otherwise), and then restores the state of the index and the
working tree (with or without untracked) and nothing else, but the
details are too long to fit in this topic ;-)
next prev parent reply other threads:[~2014-07-31 16:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-29 0:38 stash-p broken? Michael Migdol
2014-07-29 0:56 ` Michael Migdol
2014-07-29 2:59 ` brian m. carlson
2014-07-29 6:45 ` Øystein Walle
2014-07-29 9:23 ` Jeff King
2014-07-29 17:00 ` Junio C Hamano
2014-07-29 17:43 ` Jeff King
2014-07-29 18:23 ` Junio C Hamano
2014-07-31 0:23 ` Jeff King
2014-07-31 16:49 ` Junio C Hamano [this message]
2014-07-29 19:27 ` Junio C Hamano
2014-07-31 0:16 ` Jeff King
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=xmqqbns5xyl6.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=michael-spam@migdol$(echo .)net \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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