Hi, Everyone please note that history has been rewritten! (If you haven't cloned from gitorious, then ignore this e-mail.)
This is because the git repository (on gitorious) is now in use, and people have noticed that some commit authors in the git tree weren't correct. To update, do (on all local branches, if you are following more than just trunk/master): git fetch git rebase origin (The git rebase step may take a while, while it goes through all of both histories and figures out that most or all of the commits are actually identical.) If git tells you that you are 7000 or so commits ahead of origin (if you did "git pull"), then it means that you ended up with both histories merged. If "git log" tells you that the last commit was a merge, then delete the merge and rebase instead with: # This will delete the last commit, if you have any local changes, make sure you aren't deleting your own changes! git reset HEAD~1 --hard git rebase origin If you are sure you have no local changes, then you can do: # This will delete everything you have committed. git reset origin --hard -Cyp _______________________________________________ Warzone-dev mailing list [email protected] https://mail.gna.org/listinfo/warzone-dev
