From: Jeff King <peff@peff.net>
To: Liam Beguin <liambeguin@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com, houstonfortney@gmail.com,
kostix+git@007spb.ru, sxlijin@gmail.com
Subject: Re: [PATCH 1/3] stash: update documentation to use 'stash entries'
Date: Fri, 16 Jun 2017 08:06:08 -0400 [thread overview]
Message-ID: <20170616120607.dj474det3dbx6ang@sigill.intra.peff.net> (raw)
In-Reply-To: <20170616043050.29192-2-liambeguin@gmail.com>
On Fri, Jun 16, 2017 at 12:30:48AM -0400, Liam Beguin wrote:
> Most of the time, a 'stash entry' is called a 'stash'
> or a 'stash state'. Lets use 'stash entry' instead.
I agree that this reads better. There is one exception:
> diff --git a/git-stash.sh b/git-stash.sh
> index 2fb651b2b8d9..0dfa4785f361 100755
> --- a/git-stash.sh
> +++ b/git-stash.sh
> @@ -481,7 +481,7 @@ parse_flags_and_rev()
>
> case $# in
> 0)
> - have_stash || die "$(gettext "No stash found.")"
> + have_stash || die "$(gettext "No stash entry found.")"
> set -- ${ref_stash}@{0}
I don't think your change is wrong (and it's probably more grammatical
than the original), but should this perhaps be "No stashes found" or "No
stash entries found"?
-Peff
next prev parent reply other threads:[~2017-06-16 12:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-16 4:30 [PATCH 0/3] add stash count information to git-status command Liam Beguin
2017-06-16 4:30 ` [PATCH 1/3] stash: update documentation to use 'stash entries' Liam Beguin
2017-06-16 12:06 ` Jeff King [this message]
2017-06-16 21:24 ` Junio C Hamano
2017-06-16 4:30 ` [PATCH 2/3] wt-status: add optional stash status information Liam Beguin
2017-06-16 12:14 ` Jeff King
2017-06-16 21:29 ` Junio C Hamano
2017-06-16 4:30 ` [PATCH 3/3] glossary: define stash entries Liam Beguin
2017-06-16 12:16 ` Jeff King
2017-06-16 12:16 ` [PATCH 0/3] add stash count information to git-status command Jeff King
2017-06-16 12:47 ` Liam Beguin
2017-06-17 22:30 ` [PATCH v2 " Liam Beguin
2017-06-17 22:30 ` [PATCH v2 1/3] stash: update documentation to use 'stash entry' Liam Beguin
2017-06-17 22:30 ` [PATCH v2 2/3] status: add optional stash count information Liam Beguin
2017-06-17 22:30 ` [PATCH v2 3/3] glossary: define 'stash entry' Liam Beguin
2017-06-19 5:18 ` [PATCH v2 0/3] add stash count information to git-status command 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
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=20170616120607.dj474det3dbx6ang@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=houstonfortney@gmail.com \
--cc=kostix+git@007spb.ru \
--cc=liambeguin@gmail.com \
--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.
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).