From 533361dcbbc53cf237c7768efdd4cb903b8c648d Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sun, 19 Jun 2011 14:31:34 -0700 Subject: Update submodule and add a git hook --- git/hooks/post-merge | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 git/hooks/post-merge (limited to 'git') diff --git a/git/hooks/post-merge b/git/hooks/post-merge new file mode 100755 index 00000000..8bd85b78 --- /dev/null +++ b/git/hooks/post-merge @@ -0,0 +1,13 @@ +#!/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 + +# If we have local changes in the submodule, rebase them +git submodule update --rebase + +# 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 -- cgit v1.2.3-60-g2f50