Git Must Die
I see messages like: "To prevent you from losing history, non-fast-forward updates were rejected." What the F is a non-fast-forward update? Is that the best you can come up with? I go to the online manual and get a general sense of what that means (still, the term 'non-fast-forward' is ludicrous).
Still, I can't for the life of me figure out how to recover. I try a 'git pull --rebase origin:master' (WTF kind of command is that) and I get: "You asked me to pull without telling me which branch you want to rebase against, and 'branch.PostEvent.merge' in your configuration file does not tell me, either. Please specify which branch you want to use on the command line andtry again (e.g. 'git pull <repository> <refspec>')."
I then try a 'git pull --rebase origin:master' and the g*ddamn thing just hangs. Holy Christ, I need more pins for my git voodoo doll ... STAT!