News for hackers. Stuff that matters.
Re:Distrusting git by mhartl on Sunday October 02, 2011 @02:04PM (#3063494)
Running

  git pull --rebase
is a good practice. That way you can abort and roll back if there are any serious conflicts.
Re:Distrusting git by hesselink on Sunday October 02, 2011 @04:10PM (#3063874)
Be careful with this though: if you have a merge ready to push, and you pull with rebase, your merge will be 'flattened' and all commits in it duplicated on your current branch. I've been bitten by this a couple of times.
Re:Distrusting git by gcv on Sunday October 02, 2011 @02:43PM (#3063591)
Only if you actually want to rebase! While rebasing is great, it rewrites history and should not be done lightly.