Merge commit before branch tip
- From
Bradley Wagner <bradley.wagner@hannonhill.com>
- Date
- Jul 26, 2010, 15:38 UTC
- Message-ID
- <AANLkTikp5dHz97qp3pf+DE-wABNVYTGAQ+h30D9Fa04c@mail.gmail.com>
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.