I'm almost ready to flip the switch on my Vectrex Forth repository on GitHub, but for the last I-don't-know-how-many hours, I've been trying to remove an accidental commit in my log, which is driving me nuts.
* 7709e51 (HEAD -> master, origin/master, origin/HEAD) Top level README.md updates. * fdd15c1 Merge remote-tracking branch 'refs/remotes/origin/master' |\ | * 5d4cfa0 README.md fixes. * | bcbe43c A few README.md fixes. |/ * bd39a40 Cleanup of . .r u. u.r code. * 1a02462 README.md internal URL tweaks and text updates. Before I go insane, can anyone tell me how I get rid of 5d4cfa0 or bcbe43c or both, so I have a nice straight line up to HEAD?
Note, I've been hacking with "git rebase -i" all day and, i'm perfectly capable now of basic picking, dropping, squashing, joining two separate clean paths, all the basic scenarios where you don't have a merge at the end (i.e. fdd15c1), but with the merge in there, I cannot seem to fix this one.
I'm guessing I need to rebase the whole lot onto bd39a40, but everything I do just seems to do something weird and I end up aborting.