diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2011-06-19 14:31:34 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2011-06-19 14:31:34 -0700 |
| commit | 533361dcbbc53cf237c7768efdd4cb903b8c648d (patch) | |
| tree | 5794d2ca7981e0d619fa92d0a271f399808f70d7 /git/hooks/post-merge | |
| parent | a185fab9ff741a8f1da3eb8cc2aef6860338e986 (diff) | |
| download | serverdata-533361dcbbc53cf237c7768efdd4cb903b8c648d.tar.gz serverdata-533361dcbbc53cf237c7768efdd4cb903b8c648d.tar.bz2 serverdata-533361dcbbc53cf237c7768efdd4cb903b8c648d.tar.xz serverdata-533361dcbbc53cf237c7768efdd4cb903b8c648d.zip | |
Update submodule and add a git hook
Diffstat (limited to 'git/hooks/post-merge')
| -rwxr-xr-x | git/hooks/post-merge | 13 |
1 files changed, 13 insertions, 0 deletions
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 |