OK, I seem to have sorted out the trouble w/ git push ...
I updated my git installation from 1.5.x to 1.7.x and although
that in itself didn't change the outcome, the new git version
gives more informative messages. In particular when I tried
git checkout master, it said that I had 8 commits which were
not on any branch, so I should create a branch for them, so
I did, then I merged that branch into master and then I pushed
the commits successfully.
A couple of follow-up questions.
(1) if the commits weren't on any branch, where were they?
I guess I was under the mistaken impression that I had
committed them to local master.
(2) git checkout master said there were 8 commits in question,
but it only listed 4 (the 4 which were the only outstanding
unpushed commits to the best of my knowledge) and then it
only said "and 4 more". How can I find out which commits to
which it was referring? I looked in the commit log email and
it only lists the 4 I expected. I looked for unmerged commits
via git cherry applied to each local branch, but that only finds
one commit which I have excluded from merging on purpose.
Thanks for any info.
Robert Dodier