I want to reverse a git filter-branch and want to know the best way to do this.
Originally I had a repo like this :
A p q r
I then made q its own repo so that I had this:
A p r Q
Now, many commits later, I want to reverse that operation to return q to its original parent A. How can I get Q back to A.q and keep all history?