This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. from 5217e99 git/hooks: add update-merge as real file, change update to reject merges and update-merge to accept merges. new b22a1e7 git/hooks: add update-merge. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: git/hooks/{update => update-merge} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) copy git/hooks/{update => update-merge} (64%) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit b22a1e738799d90475d6259f7b1407459dd659b9 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 24 00:17:12 2015 +0100 git/hooks: add update-merge. --- git/hooks/update-merge | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/git/hooks/update-merge b/git/hooks/update-merge new file mode 100755 index 0000000..810c6b2 --- /dev/null +++ b/git/hooks/update-merge @@ -0,0 +1,11 @@ +#!/bin/bash +# +# Update hook for X2Go Git projects allowing merges. +# + +. hooks/common.sh + +. "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._check+allow-merges_" +#. "${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
-
git-admin＠x2go.org