Re: Command-line interface thoughts

From: Paul Ebermann <paul-ebermann@gmx.de>
Date: Jun 5, 2011, 21:22 UTC
Message-ID: <4DEBF3A7.9090705@gmx.de>
In-Reply-To: <201106051311.00951.jnareb@gmail.com>

Jakub Narebski skribis:

> On Sun, 5 Jun 2011, Michael Nahas wrote:
>> On Sat, Jun 4, 2011 at 5:49 PM, Jakub Narebski <jnareb@gmail.com> wrote:
>>> Michael Nahas <mike.nahas@gmail.com> writes:

[...]

Show 18 quoted lines

>>>> "stash save"
>>>>    STASH = new(new(HEAD+(NEXT-HEAD))+WTREE-NEXT)
>>>>    NEXT = HEAD
>>>>    WTREE = HEAD
>>>>    push(STASH)
>>>> "stash pop"
>>>>    STASH = pop()
>>>>    WTREE = HEAD + (STASH-STASH^^)
>>>>    NEXT = HEAD + (STASH^-STASH^^)
>>>
>>> ???
>>
>> "stash save" makes two new consecutive commits: one equal to NEXT and
>> another equal to WTREE.
> 
> No, "stash save" doesn't make two _consecutive_ commits.  It makes
> a commit which has state of worktree as one parent, and state of index
> as other parent (i.e. a merge commit).

Hmm, for me it always looked like one commit with the index state as content and HEAD as parent, and second one with the Worktree as content, and both HEAD and the mentioned index commit as parent.

This is technically a merge commit (as it has two parents), but not really done as a merge.

Paul