From: Peter Harris <git@peter.is-a-geek.org>
Date: Fri, 03 Apr 2009 16:30:46 GMT
Subject: Re: How to merge in different order?
Message-ID: <eaa105840904030930j7d576a61s25677c0dd5d16767@mail.gmail.com>
In-Reply-To: <20090403161208.GC28619@raven.wolf.lan>

On Fri, Apr 3, 2009 at 12:12 PM, Josef Wolf wrote:
> Hello,
>
> Given a branch that looks like
>
>  A1  A2  A3  A4  A5
>
> I would like to merge into another branch in the order
>
>  A1  A3  A4  A2  A5
>
> When I merge A3, then A2 is merged also.  git-merge don't seem
> to have an option to omit slurping older commits?

"git merge" merges the entire branch. It sounds like you are looking
for "git cherry-pick" instead.

Alternatively, you could run "git rebase -i A1" on the branch before
merging it. (See the docs for details)

Peter Harris