path: root/git/hooks/post-merge

#!/bin/sh
# Copy or symlink this into your .git/hooks directory.
# E.g., from the top:
#       ln -s ../../git/hooks/post-merge .git/hooks
# or    cp git/hooks/post-merge .git/hooks
# It may also be beneficial to install as a post-checkout hook

# If we have local changes in the submodule, rebase or merge them
# (rebase is better but dangerous in some circumstances)
# git submodule update --rebase
git submodule update --merge

# WARNING: to people with push access.
# it is essential that changes to the client data be pushed before changes to server data
# Also, you may find this useful: (you should always clone using the git:// url)
# git config --global url.git@gitorious.org:.pushInsteadOf git://gitorious.org