From: Eugene Sajine <euguess@gmail.com>
Date: Mon, 26 Jul 2010 16:08:44 GMT
Subject: Re: Merge commit before branch tip
Message-ID: <AANLkTi=dOpWKAg9vH6sR2Xdi1XitD6vOx6Pd8Nt3A2bJ@mail.gmail.com>
In-Reply-To: <AANLkTikp5dHz97qp3pf+DE-wABNVYTGAQ+h30D9Fa04c@mail.gmail.com>

On Mon, Jul 26, 2010 at 11:38 AM, Bradley Wagner
<bradley.wagner@hannonhill.com> wrote:
> I realize this is not a best practice but is it possible to merge a
> branch but at a point before the branch tip?
>
> This came up recently for us. There are 9 new commits in our stable
> branch that need to be merged back into "master". However, there is 1
> commit (the branch tip) that we're not all that happy with and don't
> want to merge into the "master".
>
> Ideally, I'd like them to show up as a merge rather than a cherry-pick
> basically as if I'd done the merge before that latest commit was made.

Isn't the following giving you what you need?

$ git co master
$ git merge stable~1

?

Thanks,
Eugene