From: liam Beguin <liambeguin@gmail.com>
To: Konstantin Khomoutov <kostix+git@007spb.ru>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Samuel Lijin <sxlijin@gmail.com>,
Houston Fortney <houstonfortney@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Feature Request: Show status of the stash in git status command
Date: Tue, 13 Jun 2017 08:34:17 -0400 [thread overview]
Message-ID: <be7311a1-1dfa-2cb6-4426-6771db545892@gmail.com> (raw)
In-Reply-To: <20170613064142.aww23a75pu3ytym6@tigra>
Hi,
On 13/06/17 02:42 AM, Konstantin Khomoutov wrote:
> On Mon, Jun 12, 2017 at 11:42:44PM -0400, liam Beguin wrote:
>
> [...]
>>> Conceptually, the contents of the stash are *not* commits, even
>>> though the implementation happens to use a commit to represent each
>>> stash entry. Perhaps "has %d entry/entries" is an improvement, but
>>> a quick scanning of an early part of "git stash --help" tells me
>>> that
>>
>> what's different between a stash and a commit?
>
> The same that exists between an interface and a concrete implementation
> in a programming language.
Makes sense, I thought there was a more fundamental difference.
>
> "A stash entry" is a concept which is defined to keep explicitly
> recorded untracked files and which can be applied, shown and deleted
> from the stash bag (well, you can create a branch off it as well).
I've noticed this but I don't understand when it can be used.
I'll try to find out more on this.
>
> The fact a stash entry is a merge commit of two synthetic commits is an
> implementation detail. It can be very useful at times for power users,
> but regular Git users need not be concerned with this.
>
> Another fact worth reiterating that what the UI displays to the user is
> better to match what the user reads in the docs. ;-)
>
I'll make changes as suggested by Junio. I slightly prefer
"Your stash has %d entry/entries" over "You have %d stash/stashes"
but I'll go with what's used elsewhere in the documentation.
Thanks,
- Liam
next prev parent reply other threads:[~2017-06-13 12:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-07 22:46 Feature Request: Show status of the stash in git status command Houston Fortney
2017-06-10 8:25 ` Jeff King
2017-06-10 10:12 ` Samuel Lijin
2017-06-10 10:22 ` Jeff King
2017-06-11 17:07 ` liam Beguin
2017-06-11 17:57 ` Randall S. Becker
2017-06-11 18:18 ` Igor Djordjevic
2017-06-11 18:30 ` Randall S. Becker
2017-06-12 15:35 ` Junio C Hamano
2017-06-13 3:42 ` liam Beguin
2017-06-13 6:42 ` Konstantin Khomoutov
2017-06-13 12:34 ` liam Beguin [this message]
2017-06-13 13:06 ` Junio C Hamano
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=be7311a1-1dfa-2cb6-4426-6771db545892@gmail.com \
--to=liambeguin@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=houstonfortney@gmail.com \
--cc=kostix+git@007spb.ru \
--cc=peff@peff.net \
--cc=sxlijin@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.
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).