[X2Go-Commits] [maintenancescripts] 01/01: git/hooks: add update-merge.

[git-admin at x2go.org]

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 at 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