Re: [PATCH 3/3] glossary: define stash entries

From: Jeff King <peff@peff.net>
Date: Jun 16, 2017, 12:16 UTC
Message-ID: <20170616121602.r3vjqmfcmqyvudsv@sigill.intra.peff.net>
In-Reply-To: <20170616043050.29192-4-liambeguin@gmail.com>

On Fri, Jun 16, 2017 at 12:30:50AM -0400, Liam Beguin wrote:

Show 11 quoted lines

> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> index 6e991c246915..026f66e7240a 100644
> --- a/Documentation/glossary-content.txt
> +++ b/Documentation/glossary-content.txt
> @@ -570,6 +570,10 @@ The most notable example is `HEAD`.
>  	is created by giving the `--depth` option to linkgit:git-clone[1], and
>  	its history can be later deepened with linkgit:git-fetch[1].
>  
> +[[def_stash]]stash entry::
> +	An <<def_object,object>> used to temporarily store the content of a
> +	<<def_dirty,dirty>> working directory for futur reuse.

s/futur/&e/

I think we'd usually say "contents" (plural) of a working directory.

It also stores the contents of the index. git-stash(1) says "current state of the working directory and the index".

-Peff