Remove unneeded semicolons from echo statements
Move rebase_errored to the top of the file with the rest of the variables declarations
Add a check to 'git-update' to see whether the tracking branch had been force-pushed. If it has, be conservative and do not do another force push without the user first verifying that everything appears to be correct.