Update submodule and add a git hook

3 files changed, 14 insertions, 1 deletions

diff --git a/README.mv.txt b/README.mv.txt
index adca1793..1d2ce605 100644
--- a/README.mv.txt
+++ b/README.mv.txt
@@ -24,7 +24,7 @@ git submodule update            lose changes in submodule and reset to upstream
 git submodule update --merge    merge changes in submodule from upstream
 git submodule update --rebase   rebase local changes on top of upstream
         (use this, for the same reason you should use git pull --rebase instead of just git pull - but remember that it's dangerous)
-git submodules sync             change the url of the submodule (when testing is deleted)
+git submodule sync              change the url of the submodule (when testing is deleted)
 git config --global url.git@gitorious.org:.pushInsteadOf git://gitorious.org
                                 for people with push access: don't pull via ssh (which is slower anyway), required for submodules to work properly
 git checkout HEAD^ -B master    completely roll back the latest commit
diff --git a/client-data b/client-data
-Subproject 59cab55445ae2091390ac96e4eaf3b0c1a430de
+Subproject b68b7f048ae6805df9e36e565abd210b74693bb
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