This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 5217e99ecfa0050869fcc09191aa138e9d1f8a19 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 24 00:16:06 2015 +0100 git/hooks: add update-merge as real file, change update to reject merges and update-merge to accept merges. --- git/hooks/update | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/git/hooks/update b/git/hooks/update index cfdc956..b18e2b0 100755 --- a/git/hooks/update +++ b/git/hooks/update @@ -5,12 +5,7 @@ . hooks/common.sh -MERGE="0" -[[ "$(basename ${0})" = "update-merge" ]] && MERGE="1" - -[[ "${MERGE}" = "0" ]] && \ - . "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._check_" || \ - . "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._check+allow-merges_" +. "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._check_" #. "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._branches+tags_" #. "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._acl_" . "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._grant_" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git