From: Robert Anderson <rwa000@gmail.com>
Date: Fri, 27 Jun 2008 17:34:25 GMT
Subject: Re: An alternate model for preparing partial commits
Message-ID: <9af502e50806271034o7be832b2v1e84738befbf5c2b@mail.gmail.com>
In-Reply-To: <20080627172701.GB15359@atjola.homenet>

On Fri, Jun 27, 2008 at 10:27 AM, Björn Steinbrink <B.Steinbrink@gmx.de> wrote:
>> Now I have my guess at the first commit as my tree state, correct?
>> What happens when I decide I need a couple of hunks from another file
>> which I missed in my first guess, and is now in the stashed state?
>> How do I get those out of the stash and into the working tree?  If
>> there is no convenient way to do that, then this method is not
>> sufficient to cover the use case I am talking about.
>
> git stash pop
> eventually fix conflicts if you changed the working tree in the meantime
> go back to the "git add -p" step
>
> Björn

But that pops the entire stash, right?  Inconvenient at best.

A good UI here would allow you to move pieces bidirectionally to/from
the stash at will until the desired, verifiable factorization of
changes has been achieved.

Thanks,
Bob