From: Avery Pennarun <apenwarr@gmail.com>
Date: Thu, 18 Mar 2010 16:36:17 GMT
Subject: Re: [PATCH] Clarification for the command "git checkout <branch>"
Message-ID: <32541b131003180936x746dad06k386788d3cb6fcdeb@mail.gmail.com>
In-Reply-To: <4BA1FC39.10300@web.de>

On Thu, Mar 18, 2010 at 6:11 AM, Markus Elfring <Markus.Elfring@web.de> wrote:
>> You may want retry the command after recording the local changes
>> (1) in a temporary commit on the current branch,
>
> Can commits be consistently marked for intermediate use?
> Can such "special" commits be easily found later on?

You just make the commit with a 'FIXME' type commit message, then 'git
commit --amend' to fix it when you come back later.

>> or (2) by using "git stash".
>
> Is this storage operation supported per branch?
> Does a checkout look if any files were stashed away for the specified branch before?

stashing isn't really something you'd want to do on a per-branch
basis.  Most of the point is that you stash away your changes, then
switch to another branch, then restore your stash to your *current*
working state sometime later.

Have fun,

Avery