Re: How to merge into my working copy?

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 6, 2009, 17:53 UTC
Message-ID: <7v8wejzgim.fsf@alter.siamese.dyndns.org>
In-Reply-To: <e2a1d0aa0911060653t7bbb54ebp948eac0dffeaba64@mail.gmail.com>

Patrick Doyle <wpdster@gmail.com> writes:

Show 11 quoted lines

> I would like to pull a set of changes from a branch back into the
> working copy of my current branch without affecting the index.  I
> can't figure out the right combination of --commit, --no-commit, -ff,
> -no-ff, --log, --no-log, --squash, --no-squash, etc... options to use
> with git-merge.
>
> 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.

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.