On Thu, 08 Mar 2012 19:35:51 +0000, Matthieu Moy wrote: ... > If someone else did a push between my first push and the "push --force", > then the other user's push is discarded. A push --semiforce would help here: Should check whether the remote branch is at the same commit as origin/master locally, and only then set to new local master. (Would probably require protocol change to actuall be atomic.) Andreas -- "Totally trivial. Famous last words." From: Linus Torvalds <torvalds@*.org> Date: Fri, 22 Jan 2010 07:29:21 -0800 -- 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