Question

We have a bit of a mess where an old branch had subsequent work done
that was all merged down to a dev branch, but with other work done in dev in between
so:

we started with dev
then branched off to 5.6.9
work continued on dev, but also on 5.6.9
all work on 5.6.9 was merged down into dev
a branch was created off the latest in dev (by this stage ~1800 commits ahead of 5.6.9) and then merged into 5.6.9 – which is what we want to revert

we dont have a linear history we could revert back to a given commit because of the work done on 5.6.9 in between commits on dev, and cant find any way to find a commit hash for the merge as the log of the old branch now contains all of dev (ie git log –merges shows all the feature branches merged in to dev, not the merge into 5.6.9 that we did)

Is there a record git keeps of all merges? And any way to tell it to undo a merge (that has been pushed)?

Answer 1

You could do a

git log --grep Merge

To get your commitid.

And then:

git rebase --onto <commit-id>^ <commit-id> HEAD

That should deal with it.