I think the reason I hate git so much is because it makes me feel stupid. I know what I want to do, and I know git can do it, but I don't know the magic command to make git do it. And git doesn't have an "undo" command, so that you can get whacked on the hand for just trying things. There's no affordance, so that you can't guess at what a command does and be right 80% of the time.
Here's git's version of undo: "tar cfz ~/backups/git ." Haha, that's pitiful in the year 2015. I COULD HAVE DONE THAT THIRTY-FIVE YEARS AGO, AND DID. Yes, Unix has sharp tools that let you do awesome things, but why does git have to have sharp edges on the handle, too?
I hate git, I really do.
And then there's github, which is probably 50% at fault for making git even worse than it already is. Maybe 60%.
So, in case you're still reading, I have made changes to swtools/WOFpy that I want to give back, but the authors say "OH HAI, we're not working on that anymore, go contribute to ODM2/WOFpy, which is a fork." So I'd like to sync my code to their changes without losing any of my changes (I don't think they conflict). WHY IS THIS SO HARD??? WHY DOESN'T THIS WORK:
git master rebase --remote all + 70274854fuc35
git reset --all --force --yes
git lift * -X -e -m
Git is not a productivity tool. Every time I try to do anything more than: git commit -a -m "stuff" I lose hours of time. But THANK GOD MY CODE IS CHECKED INTO GIT, BECAUSE i COULD LOSE HOURS OF TIME.
Holy fucking Jesus. I'm gonna go back to making backups with tar, and creating patches using diff -ur and sending them via email and if you don't want my code, you don't have to use it.