cool article about tracking down a bug in git. But this is really a small corner case and I can see how it went unnoticed for a year. I almost never use 'git

cool article about tracking down a bug in git. But this is really a small corner case and I can see how it went unnoticed for a year. I almost never use 'git pull' (I do git fetch and then "git merge" or "git rebase" depending on the results), but more importantly I never ever use pull when I have changes in my current working repository. I commit, and then I pull or pull --rebase etc. This way I'm really sure that my data is safe as git has a lot of safety features for committed stuff. all files are stored as objects and there is a reflog to help if you loose track of rebased branch etc. Another thing that I sometimes do is 'git stash' before pull/merge/rebase etc. git apply later is also a very safe op.