From: Bruce Stephens <bruce.stephens@isode.com>
Date: Fri, 06 Nov 2009 14:59:32 GMT
Subject: Re: How to merge into my working copy?
Message-ID: <80aayzg0mj.fsf@tiny.isode.net>
In-Reply-To: <e2a1d0aa0911060653t7bbb54ebp948eac0dffeaba64@mail.gmail.com>

Patrick Doyle <wpdster@gmail.com> writes:

[...]

> Basically, I created a branch off my mainline branch a few days ago.
> Made some commits on that branch.  Then went back to my mainline
> branch, made a few commits there, and now I would like to make my
> working copy look like a merge of its current state with the changes
> from the branch, minus any associated commits.
>
> I probably should have just used git-stash to tuck those changes away,
> but I didn't.

Rather than spending time worrying about optimal ways to do this,
wouldn't it work just to do merge (to get the right tree) followed by
rebase -i to get the commits in the way you want (removing the merge,
anyway)?

[...]