Peter Kjellerstedt:
Can you differentiate between an automatic merge which happened because the user had made some local changes before pulling (which I do not want to appear in the central repo), and a real merge of a topic branch (which I do want)?
Sort of, by looking at the commit message. An auto-generated pull-merge will contain the branch name twice, once with the remote repository path, and once with the local repository path. You could walk the history that the user tries to push, looking for this kind of auto-generated merge messages.
This may of course teach your users to re-write the commit message into something more sensible, but that can only be a good thing :-)
-- \\// Peter - http://www.softwolves.pp.se/ -- 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