[X2Go-Commits] [maintenancescripts] branch master updated (48b7280 -> 5217e99)

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository maintenancescripts.

      from  48b7280   git/hooks: add update-merge symlink to make this function clear to users.
       new  5adcca2   git/hooks: delete update-merge symlink, won't work with git hooks.
       new  5217e99   git/hooks: add update-merge as real file, change update to reject merges and update-merge to accept merges.

The 2 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       |    7 +------
 git/hooks/update-merge |    1 -
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 120000 git/hooks/update-merge

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git