News for hackers. Stuff that matters.
Re:Distrusting git by ori_b on Saturday October 01, 2011 @01:53PM (#3060591)
Do the fetch, diff against remote/branch and see what changed, look at the commit logs, and then merge.
Re:Distrusting git by bennoleslie on Saturday October 01, 2011 @08:24PM (#3061600)
Sure, I would agree with that, but in this case I already knew what the one commit I was pulling did. And the fetch,diff, merge wouldn't have helped. The file that was destroyed wasn't changed in the commit that was fetched.