my git stupidity

[Karl Berry]

I think I inadvertently messed up the git commit again (committed before
pulling on trunk).  I don't remember the terminology, sorry.  Anyway, I
took more steps to hopefully avoid this in the future.