This seems to be because of the rebase. Don't try to rebase anymore - I will eventually pull and merge locally myself instead :-)