From: Avery Pennarun <apenwarr@gmail.com>
Date: Fri, 19 Mar 2010 17:17:35 GMT
Subject: Re: [PATCH] Clarification for the command "git checkout <branch>"
Message-ID: <32541b131003191017rdc4e87fgcc4fabc76e0709be@mail.gmail.com>
In-Reply-To: <4BA335B6.4000103@web.de>

On Fri, Mar 19, 2010 at 4:28 AM, Markus Elfring <Markus.Elfring@web.de> wrote:
>> The stash can contain multiple entries.  They're stored in a stack,
>> but you can pull prior entries out of the stack if you want.
>
> I am missing a semantic relationship of the stashed files to the work that they
> belong to in various branches. I would appreciate to see a clear connection
> between them.

Then what you want is just a temporary commit.

I think your mental model has exaggerated the cost of a commit.
Commits cost almost exactly zero.

    git commit -a -m 'FIXME temporary'

And there you have it.  When you want to undo the commit or update it,
you just do

    git reset HEAD^

and it's as if the commit never happened.  Or don't reset, but just
make further changes and replace the commit:

    git commit -a --amend

Which part isn't acceptable?

Have fun,

Avery