Better error message when git master is out-of-sync

This typically happens if someone modified the git master by other mean than
this script.
Rewrote some comments / error