Git Must Die

Try this:

git checkin --maybe origin:remote:local/master/SUB_HEAD -- master/HEAD --headless -non-fastforward <your sub-module directory root>

Er.. you should check this first before doing this in a real repository, or is that a branch? I get these mixed up.. and then again was it git branch or git checkin, there is no checkin? Ok maybe the sub master root's HEAD needs to be manually reset in an editor to point to the previous sha head that was not fast forwarded but was normal forwarded.. I'm still looking for the command that undoes my screwups so I came up with tar. If you tar a copy of all your work, put that tar file someplace far away from git, then try git for a couple of hours then have not one clue what the hell state you are in, you can rm -rf the entire git directory, untar the saved tree and start over. Flush 2 or 3 hours of your life down the toilet.. God I hate this stupid thing.