Re: Dropping a merge from history -- rebase or filter-branch or ...?

2017-07-11 Thread Andrew Ardill
Hi Martin, >From the sound of it you really just want to revert the merge of the pull requests. A really good description of options for this is at https://git-scm.com/blog/2010/03/02/undoing-merges.html There is also a section there about bringing the changes back in at a future date, depending

Dropping a merge from history -- rebase or filter-branch or ...?

2017-07-07 Thread Martin Langhoff
Hi git-folk! long time no see! I'm trying to do one of those "actually, please don't" things that turn out to be needed in the field. I need to open our next "for release" development branch from our master, but without a couple of disruptive feature branches, which have been merged into master