News for hackers. Stuff that matters.
Re:Distrusting git by bennoleslie on Saturday October 01, 2011 @08:31PM (#3061617)
In this case the git pull man page is relatively clear that:

"If any of the remote changes overlap with local uncommitted changes, the merge will be automatically cancelled and the work tree untouched"

Re:Distrusting git by kelnos on Sunday October 02, 2011 @01:02AM (#3062117)
... which git failed to do properly. So the git-pull man page is clear that it won't clobber your uncommitted changes. Except in the (buggy) case when it will.