Re: Merge commit before branch tip

On Mon, Jul 26, 2010 at 11:38 AM, Bradley Wagner
[off-list ref] 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