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.
Hi Bradley,
Bradley Wagner 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?
I do not even think it is not a best practice. You can do
$ git fetch --all
$ git merge origin/master~1
and git will happily create a merge with message
Merge remote branch 'origin/master' (early part)
(See the "SPECIFYING REVISIONS" section of git-rev-parse(1)
for more examples.)
Hope that helps,
Jonathan
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