Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

Merge commit before branch tip

From: Bradley Wagner <hidden>
Date: 2016-06-15 22:49:11

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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help