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