Grr... another git srupid

[Joel Sherrill]

Hi

Apparently I just did something I didn't understand. In the process
of resolving a non-fast forward error, I apparently generated a bunch
or re-commit messages.

I think something is not happening right for Jennifer and I.  We
were doing OK but now our "origin" is not tracking the "upstream"
as well as it should and it is causing us issues.

Jennifer's problem is different from mine but we both are more ignorant
on git than we need to be.

--joel