summaryrefslogtreecommitdiff
path: root/git/hooks
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-06-21 10:36:08 -0700
committerBen Longbons <b.r.longbons@gmail.com>2011-06-21 10:36:08 -0700
commit076374258a9869e57006611116bb257af37b864e (patch)
tree898dc400aea1c75fc03183522dbb53614a730aa8 /git/hooks
parent8558570c63587f7ba26836bb8a1bf78b9b7a7cc5 (diff)
downloadserverdata-076374258a9869e57006611116bb257af37b864e.tar.gz
serverdata-076374258a9869e57006611116bb257af37b864e.tar.bz2
serverdata-076374258a9869e57006611116bb257af37b864e.tar.xz
serverdata-076374258a9869e57006611116bb257af37b864e.zip
Make post-merge hook safer
Diffstat (limited to 'git/hooks')
-rwxr-xr-xgit/hooks/post-merge7
1 files changed, 5 insertions, 2 deletions
diff --git a/git/hooks/post-merge b/git/hooks/post-merge
index 8bd85b78..c5354cfd 100755
--- a/git/hooks/post-merge
+++ b/git/hooks/post-merge
@@ -3,9 +3,12 @@
# 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 them
-git submodule update --rebase
+# 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