Fix a typo.
Remove superfluous ${INSTALL_STRIP} uses.
Match latest git's repo status messages.
Match latest git's repo branch message.
Set GIT_MERGE_AUTOEDIT=no in the environment.