Be wary of ChangeLog with "git pull --rebase"

[Bart Schaefer <schaefer@xxxxxxxxxxxxxxxx>]

I just had to very carefully resolve a problem where my latest committed
ChangeLog entries were discarded and replaced by unrelated ChangeLog entries
from origin/master.  This was not obvious from the merge-conflict diff that
was created by the pull and in fact I'd have missed it entirely if I had
not also made a different mistake ("git commit" instead of "git add" before
continuing the rebase).

-- 
Barton E. Schaefer