From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 02 Mar 2010 17:50:29 GMT
Subject: Re: Better cooperation between checkouts and stashing
Message-ID: <7vvdde62ai.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4B8CDBCA.4030101@web.de>

Markus Elfring <Markus.Elfring@web.de> writes:

> How are the chances to make unfinished and uncommitted content updates sticky
> for a particular branch (or a selection of branches) so that changes will not be
> mixed more as it will be really required for an editing task?

Traditionally the right way to do this has been to make a temporary commit
on the branch, i.e.

    $ git checkout topic
    work work work... yikes, I cannot get this working
    $ git commit -a -m 'wip: does not work yet' ;# temporary commit
    $ git checkout other-topic
    work work work....
    $ git checkout topic
    $ git reset --soft HEAD^ ;# drop the temporary commit

I didn't re-read our documentation set for some time, but don't we teach
this anymore?