diff options
Diffstat (limited to 'git')
| -rwxr-xr-x | git/hooks/post-merge | 7 |
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 |