From: Patrick Doyle <wpdster@gmail.com>
Date: Fri, 06 Nov 2009 18:15:37 GMT
Subject: Re: How to merge into my working copy?
Message-ID: <e2a1d0aa0911061015o412f1ab0k9fbfdb88431d49c9@mail.gmail.com>
In-Reply-To: <7v8wejzgim.fsf@alter.siamese.dyndns.org>

On Fri, Nov 6, 2009 at 12:53 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
> If you do not have to have your extra "without affecting the index"
> constraint (which I do not see a sensible reason to want to, by the way),
> you can "merge --no-commit that_branch", I think.
>

After bouncing this around a couple of times with Bruce Stephens, and
only now noticing that I hit "Reply" instead of "Reply-All"... sigh),
I realized that what I wanted was:

$ git merge --squash that_branch
$ git reset

I only wanted to affect my working copy, editing and adding things to
the index (which I think of as "staging area for my next commit") as I
was ready.

--wpd