From: Kevin Daudt <me@ikke.info>
To: rpjday@crashcourse.ca
Cc: git@vger.kernel.org
Subject: Re: distinguishing between staged and unstaged content in a stash?
Date: Wed, 4 Oct 2017 17:03:45 +0200 [thread overview]
Message-ID: <20171004150345.GC1667@alpha.vpn.ikke.info> (raw)
In-Reply-To: <20171004071046.Horde.89FTNuoUz8wPxhsuejrB03G@crashcourse.ca>
On Wed, Oct 04, 2017 at 07:10:46AM -0400, rpjday@crashcourse.ca wrote:
>
> couple (admittedly trivial) questions about stashing. first, can i
> clarify that when one stashes content, a stash *always* distinguishes
> between what was staged, and what was unstaged? that is, when one is
> stashing, the "--keep-index" option relates to whether or not staged
> changes are left in the index (and, consequently, in the working
> directory as well), but that option has no effect on the final content
> of the stash, yes? even if "--keep-index" is used, staged content
> still ends up in the stash.
>
> also, is there a simple way to distinguish between the staged and
> unstaged contents of a stash (or, more basically, is this even a
> useful question to ask)? out of curiosity, i tried to figure out
> how to do this, and came up with the following.
>
> to see staged portion of stash@{0}:
>
> $ git show stash@{0}^2
>
> to see unstaged portion:
>
> $ git diff stash@{0}^2 stash@{0}
>
> it's not like i have a pressing need to do that, i was just curious
> if there's a simpler way to do this, or if this is just not something
> people should need to do on a regular basis.
>
> rday
>
>
>
There was a recent thread about this[0]. The conclusion is that it's
seen as a good change, someone just needs to supply the patch to do
this. A possible solution was also provided (from before that thread)
here [1]
[0]:https://public-inbox.org/git/1505626069.9625.6.camel@gmail.com/
[1]:https://public-inbox.org/git/20170317141417.g2oenl67k74nlqrq@sigill.intra.peff.net/
next prev parent reply other threads:[~2017-10-04 15:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-04 11:10 distinguishing between staged and unstaged content in a stash? rpjday
2017-10-04 15:03 ` Kevin Daudt [this message]
2017-10-04 15:24 ` Robert P. J. Day
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=20171004150345.GC1667@alpha.vpn.ikke.info \
--to=me@ikke.info \
--cc=git@vger.kernel.org \
--cc=rpjday@crashcourse.ca \
/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).