> $ git remote update > $ git reset --hard origin/master # when on master > > BTW. it is stated countless time in documentation that published > history should be not rebased, barring some extenuating circumstances Yes and people countless times ignore that recommendation and do it anyways (for good reasons). And then other users have to deal with these rebased trees somehow. Anyways it is all solvable but right now ill supported in standard commands and the documentation does not really cover it. I was just asking (mostly for others to avoid going through the same pain as me) for that to be improved so that git becomes easier to use. Sadly you guys don't even seem to want to recognize there is a problem :-( -Andi -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html